w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[postprocessor/ffmpeg] Relax ubuntu ffmpeg version regex

Browse source
This commit is contained in:
Sergey M․ 2019-01-12 00:30:06 +07:00
parent 5caa531a1a
commit cbdc688c41
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
youtube_dl/postprocessor/ffmpeg.py
View file

@ -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)