github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[postprocessor:ugoira] do not auto-select image2 demuxer (#2492)

Browse Source
This commit is contained in:
Mike Fährmann
2022-04-12 21:47:47 +02:00
parent 3e942a58be
commit 24ea1398bc
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/configuration.rst
View File

@@ -3275,12 +3275,11 @@ Default
Description Description
FFmpeg demuxer to read and process input files with. Possible values are FFmpeg demuxer to read and process input files with. Possible values are
* "`concat <https://ffmpeg.org/ffmpeg-formats.html#concat-1>`_" (inaccurate frame timecodes) * "`concat <https://ffmpeg.org/ffmpeg-formats.html#concat-1>`_" (inaccurate frame timecodes for non-uniform frame delays)
* "`image2 <https://ffmpeg.org/ffmpeg-formats.html#image2-1>`_" (accurate timecodes, not usable on Windows) * "`image2 <https://ffmpeg.org/ffmpeg-formats.html#image2-1>`_" (accurate timecodes, requires nanosecond file timestamps, i.e. no Windows or macOS)
* "mkvmerge" (accurate timecodes, only WebM or MKV, requires `mkvmerge <ugoira.mkvmerge-location_>`__) * "mkvmerge" (accurate timecodes, only WebM or MKV, requires `mkvmerge <ugoira.mkvmerge-location_>`__)
`"auto"` will select `mkvmerge` if possible and fall back to `image2` or `"auto"` will select `mkvmerge` if available and fall back to `concat` otherwise.
`concat` depending on the local operating system.
ugoira.ffmpeg-location ugoira.ffmpeg-location

2
gallery_dl/postprocessor/ugoira.py
View File

@@ -49,7 +49,7 @@ class UgoiraPP(PostProcessor):
mkvmerge or shutil.which("mkvmerge")): mkvmerge or shutil.which("mkvmerge")):
demuxer = "mkvmerge" demuxer = "mkvmerge"
else: else:
demuxer = "concat" if util.WINDOWS else "image2" demuxer = "concat"
if demuxer == "mkvmerge": if demuxer == "mkvmerge":
self._process = self._process_mkvmerge self._process = self._process_mkvmerge