diff options
| author | Remita Amine <remitamine@gmail.com> | 2019-01-11 15:09:44 +0100 | 
|---|---|---|
| committer | Remita Amine <remitamine@gmail.com> | 2019-01-11 15:12:10 +0100 | 
| commit | a64646e417615173c9436887116402c9c4c9f6ee (patch) | |
| tree | 31865ce48491acee6e9d4227c3139bb68e4e7c13 | |
| parent | c469e8808c723d6ba090c0b33c292622a3cb555e (diff) | |
[postprocessor/ffmpeg] sanitize ffmpeg version for Ubuntu and Arch Linux systems(closes #18813)
| -rw-r--r-- | youtube_dl/postprocessor/ffmpeg.py | 18 | 
1 files changed, 15 insertions, 3 deletions
| diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py index efcd39d57..173bdbe68 100644 --- a/youtube_dl/postprocessor/ffmpeg.py +++ b/youtube_dl/postprocessor/ffmpeg.py @@ -79,6 +79,19 @@ class FFmpegPostProcessor(PostProcessor):          programs = ['avprobe', 'avconv', 'ffmpeg', 'ffprobe']          prefer_ffmpeg = True +        def get_ffmpeg_version(path): +            ver = get_exe_version(path, args=['-version']) +            if ver: +                regexs = [ +                    r'([0-9.]+)-0ubuntu0\.[0-9.]+$', # Ubuntu +                    r'n([0-9.]+)$', # Arch Linux +                ] +                for regex in regexs: +                    mobj = re.match(regex, ver) +                    if mobj: +                        ver = mobj.group(1) +            return ver +          self.basename = None          self.probe_basename = None @@ -110,11 +123,10 @@ class FFmpegPostProcessor(PostProcessor):                  self._paths = dict(                      (p, os.path.join(location, p)) for p in programs)                  self._versions = dict( -                    (p, get_exe_version(self._paths[p], args=['-version'])) -                    for p in programs) +                    (p, get_ffmpeg_version(self._paths[p])) for p in programs)          if self._versions is None:              self._versions = dict( -                (p, get_exe_version(p, args=['-version'])) for p in programs) +                (p, get_ffmpeg_version(p)) for p in programs)              self._paths = dict((p, p) for p in programs)          if prefer_ffmpeg is False: | 
