From 24ea1398bc4db75a0027caddcc0c1820718cc8ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Tue, 12 Apr 2022 21:47:47 +0200 Subject: [PATCH] [postprocessor:ugoira] do not auto-select image2 demuxer (#2492) --- docs/configuration.rst | 7 +++---- gallery_dl/postprocessor/ugoira.py | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/configuration.rst b/docs/configuration.rst index 9cb2b7f9..a0e74fac 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -3275,12 +3275,11 @@ Default Description FFmpeg demuxer to read and process input files with. Possible values are - * "`concat `_" (inaccurate frame timecodes) - * "`image2 `_" (accurate timecodes, not usable on Windows) + * "`concat `_" (inaccurate frame timecodes for non-uniform frame delays) + * "`image2 `_" (accurate timecodes, requires nanosecond file timestamps, i.e. no Windows or macOS) * "mkvmerge" (accurate timecodes, only WebM or MKV, requires `mkvmerge `__) - `"auto"` will select `mkvmerge` if possible and fall back to `image2` or - `concat` depending on the local operating system. + `"auto"` will select `mkvmerge` if available and fall back to `concat` otherwise. ugoira.ffmpeg-location diff --git a/gallery_dl/postprocessor/ugoira.py b/gallery_dl/postprocessor/ugoira.py index 58b49afd..bd2ed1b6 100644 --- a/gallery_dl/postprocessor/ugoira.py +++ b/gallery_dl/postprocessor/ugoira.py @@ -49,7 +49,7 @@ class UgoiraPP(PostProcessor): mkvmerge or shutil.which("mkvmerge")): demuxer = "mkvmerge" else: - demuxer = "concat" if util.WINDOWS else "image2" + demuxer = "concat" if demuxer == "mkvmerge": self._process = self._process_mkvmerge