From: Sergey M․ <dstftw@gmail.com>
Date: Fri, 11 Jan 2019 17:30:06 +0000 (+0700)
Subject: [postprocessor/ffmpeg] Relax ubuntu ffmpeg version regex
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=cbdc688c41876714f1d7e2f82ba9d11f6695448a;p=youtube-dl

[postprocessor/ffmpeg] Relax ubuntu ffmpeg version regex
---

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)