Browse Source

[postprocessor/ffmpeg] Relax ubuntu ffmpeg version regex

master-ytdl-org
Sergey M․ 6 years ago
parent
commit
cbdc688c41
No known key found for this signature in database GPG Key ID: 2C393E0F18A9236D
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      youtube_dl/postprocessor/ffmpeg.py

+ 2
- 1
youtube_dl/postprocessor/ffmpeg.py View 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)


Loading…
Cancel
Save