diff options
Diffstat (limited to 'net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py')
| -rw-r--r-- | net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py b/net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py index c6fafa97263..5e8c3af72de 100644 --- a/net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py +++ b/net/youtube-dl/patches/patch-youtube__dl_postprocessor_ffmpeg.py @@ -1,6 +1,8 @@ -$NetBSD: patch-youtube__dl_postprocessor_ffmpeg.py,v 1.2 2018/04/25 15:42:12 leot Exp $ +$NetBSD: patch-youtube__dl_postprocessor_ffmpeg.py,v 1.3 2018/05/06 10:22:59 leot Exp $ -Also look and use ffmpeg[23] if possible. +Also look and use ffmpeg[234]/ffproble[234] if possible, preferring +the unversioned one (i.e. selected via alternatives framework) +or the newest one. --- youtube_dl/postprocessor/ffmpeg.py.orig 2016-02-09 11:57:41.000000000 +0000 +++ youtube_dl/postprocessor/ffmpeg.py @@ -9,7 +11,7 @@ Also look and use ffmpeg[23] if possible. def _determine_executables(self): - programs = ['avprobe', 'avconv', 'ffmpeg', 'ffprobe'] -+ programs = ['avprobe', 'avconv', 'ffmpeg', 'ffmpeg3', 'ffmpeg2', 'ffprobe', 'ffprobe3', 'ffprobe2'] ++ programs = ['avprobe', 'avconv', 'ffmpeg', 'ffmpeg4', 'ffmpeg3', 'ffmpeg2', 'ffprobe', 'ffprobe4', 'ffprobe3', 'ffprobe2'] prefer_ffmpeg = False self.basename = None @@ -18,7 +20,7 @@ Also look and use ffmpeg[23] if possible. return None location = os.path.dirname(os.path.abspath(location)) - if basename in ('ffmpeg', 'ffprobe'): -+ if basename in ('ffmpeg', 'ffmpeg3', 'ffmpeg2', 'ffprobe', 'ffprobe3', 'ffprobe2'): ++ if basename in ('ffmpeg', 'ffmpeg4', 'ffmpeg3', 'ffmpeg2', 'ffprobe', 'ffprobe4', 'ffprobe3', 'ffprobe2'): prefer_ffmpeg = True self._paths = dict( @@ -27,10 +29,10 @@ Also look and use ffmpeg[23] if possible. if prefer_ffmpeg: - prefs = ('ffmpeg', 'avconv') -+ prefs = ('ffmpeg', 'ffmpeg3', 'ffmpeg2', 'avconv') ++ prefs = ('ffmpeg', 'ffmpeg4', 'ffmpeg3', 'ffmpeg2', 'avconv') else: - prefs = ('avconv', 'ffmpeg') -+ prefs = ('avconv', 'ffmpeg', 'ffmpeg3', 'ffmpeg2') ++ prefs = ('avconv', 'ffmpeg', 'ffmpeg4', 'ffmpeg3', 'ffmpeg2') for p in prefs: if self._versions[p]: self.basename = p @@ -38,10 +40,10 @@ Also look and use ffmpeg[23] if possible. if prefer_ffmpeg: - prefs = ('ffprobe', 'avprobe') -+ prefs = ('ffprobe', 'ffprobe3', 'ffprobe2', 'avprobe') ++ prefs = ('ffprobe', 'ffprobe4', 'ffprobe3', 'ffprobe2', 'avprobe') else: - prefs = ('avprobe', 'ffprobe') -+ prefs = ('avprobe', 'ffprobe', 'ffprobe3', 'ffprobe2') ++ prefs = ('avprobe', 'ffprobe', 'ffprobe4', 'ffprobe3', 'ffprobe2') for p in prefs: if self._versions[p]: self.probe_basename = p |