projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[postprocessor/ffmpeg] Relax ubuntu ffmpeg version regex
[youtube-dl]
/
youtube_dl
/
postprocessor
/
ffmpeg.py
diff --git
a/youtube_dl/postprocessor/ffmpeg.py
b/youtube_dl/postprocessor/ffmpeg.py
index a9fafa363b762acd7cc7151a82abc9bec5996cca..39a905380c2634509c9ca2e88558e41caf0dd899 100644
(file)
--- 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 = [
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
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)
]
for regex in regexs:
mobj = re.match(regex, ver)