diff options
| author | Sergey M․ <dstftw@gmail.com> | 2019-01-12 00:30:06 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2019-01-12 00:30:06 +0700 |
| commit | cbdc688c41876714f1d7e2f82ba9d11f6695448a (patch) | |
| tree | 51c5a84bfa0c1fa00da9449b4194db1fe5a05c1d | |
| parent | 5caa531a1a7e070e3bef8cc60c3d00c3f7ab1e6c (diff) | |
[postprocessor/ffmpeg] Relax ubuntu ffmpeg version regex
| -rw-r--r-- | youtube_dl/postprocessor/ffmpeg.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py index a9fafa363..39a905380 100644 --- a/youtube_dl/postprocessor/ffmpeg.py +++ b/youtube_dl/postprocessor/ffmpeg.py @@ -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) |