youtube-dl

commit 5f82b129e085eb122b6129df36e45925f5b4546a
parent 64269e4d0117a04096696532bccd90ee6b176f25
Author: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date:   Sun, 26 Oct 2014 18:11:31 +0100

[ffmpeg] Also look into stderr for extracting the version

At least with avconv 11, it will print 'avconv version 11, ..' to stderr, not stdout.

Diffstat:
M
youtube_dl/postprocessor/ffmpeg.py
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py
@@ -26,7 +26,7 @@ def get_version(executable):
     try:
         out, err = subprocess.Popen(
             [executable, '-version'],
-            stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+            stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()
     except OSError:
         return False
     firstline = out.partition(b'\n')[0].decode('ascii', 'ignore')