Raphaël G. Git Repositories - youtubedl/blob - debian/patches/fix_libav_compat_outdated.patch

   1 From: Carlos Maddela <e7appew@gmail.com>
   2 Date: Wed, 2 Mar 2016 04:20:06 +1100
   3 Subject: Stop libav compatibility links from being considered as genuine.
   4
   5 Description: Stop libav compatibility links from being considered as genuine.
   6  Don't register version numbers for compatibility links, so that
   7  youtube-dl stops complaining about avconv being outdated.
   8 Author: Carlos Maddela <e7appew@gmail.com>
   9 Origin: vendor
  10 Bug: https://github.com/rg3/youtube-dl/pull/8720
  11 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=798936
  12 Last-Update: 2016-06-27
  13 ---
  14 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  15 ---
  16  youtube_dl/postprocessor/ffmpeg.py | 9 +++++++--
  17  1 file changed, 7 insertions(+), 2 deletions(-)
  18
  19 diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py
  20 index fa99b0c..29beb48 100644
  21 --- a/youtube_dl/postprocessor/ffmpeg.py
  22 +++ b/youtube_dl/postprocessor/ffmpeg.py
  23 @@ -98,11 +98,16 @@ class FFmpegPostProcessor(PostProcessor):
  24                  self._paths = dict(
  25                      (p, os.path.join(location, p)) for p in programs)
  26                  self._versions = dict(
  27 -                    (p, get_exe_version(self._paths[p], args=['-version']))
  28 +                    (p, get_exe_version(self._paths[p], args=['-version'],
  29 +                                        version_re=r'%s\s+version\s+([-0-9._a-zA-Z]+)' % p,
  30 +                                        unrecognized=False))
  31                      for p in programs)
  32          if self._versions is None:
  33              self._versions = dict(
  34 -                (p, get_exe_version(p, args=['-version'])) for p in programs)
  35 +                (p, get_exe_version(p, args=['-version'],
  36 +                                    version_re=r'%s\s+version\s+([-0-9._a-zA-Z]+)' % p,
  37 +                                    unrecognized=False))
  38 +                for p in programs)
  39              self._paths = dict((p, p) for p in programs)
  40
  41          if prefer_ffmpeg: