Browse Source

[postprocessor/ffmpeg] Relax ubuntu ffmpeg version regex

Sergey M․ 6 years ago
parent
commit
cbdc688c41
1 changed files with 2 additions and 1 deletions
  1. 2 1
      youtube_dl/postprocessor/ffmpeg.py

+ 2 - 1
youtube_dl/postprocessor/ffmpeg.py

@@ -83,8 +83,9 @@ class FFmpegPostProcessor(PostProcessor):
             ver = get_exe_version(path, args=['-version'])
             ver = get_exe_version(path, args=['-version'])
             if ver:
             if ver:
                 regexs = [
                 regexs = [
-                    r'([0-9.]+)-0ubuntu0\.[0-9.]+$',  # Ubuntu
+                    r'(?:\d+:)?([0-9.]+)-[0-9]+ubuntu[0-9.]+$',  # Ubuntu, see [1]
                     r'n([0-9.]+)$',  # Arch Linux
                     r'n([0-9.]+)$',  # Arch Linux
+                    # 1. http://www.ducea.com/2006/06/17/ubuntu-package-version-naming-explanation/
                 ]
                 ]
                 for regex in regexs:
                 for regex in regexs:
                     mobj = re.match(regex, ver)
                     mobj = re.match(regex, ver)