]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[postprocessor/ffmpeg] Relax ubuntu ffmpeg version regex
authorSergey M․ <dstftw@gmail.com>
Fri, 11 Jan 2019 17:30:06 +0000 (00:30 +0700)
committerSergey M․ <dstftw@gmail.com>
Fri, 11 Jan 2019 17:30:06 +0000 (00:30 +0700)
youtube_dl/postprocessor/ffmpeg.py

index a9fafa363b762acd7cc7151a82abc9bec5996cca..39a905380c2634509c9ca2e88558e41caf0dd899 100644 (file)
@@ -83,8 +83,9 @@ class FFmpegPostProcessor(PostProcessor):
             ver = get_exe_version(path, args=['-version'])
             if ver:
                 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
+                    # 1. http://www.ducea.com/2006/06/17/ubuntu-package-version-naming-explanation/
                 ]
                 for regex in regexs:
                     mobj = re.match(regex, ver)