summary refs log tree commit diff
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2014-10-26 18:11:31 +0100
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2014-10-26 18:11:31 +0100
commit5f82b129e085eb122b6129df36e45925f5b4546a (patch)
treefd2cada4a0f655f477fe3fe8b9a53b1ab1fba5a6
parent64269e4d0117a04096696532bccd90ee6b176f25 (diff)
downloadyoutube-dl-5f82b129e085eb122b6129df36e45925f5b4546a.tar.gz
youtube-dl-5f82b129e085eb122b6129df36e45925f5b4546a.tar.xz
youtube-dl-5f82b129e085eb122b6129df36e45925f5b4546a.zip
[ffmpeg] Also look into stderr for extracting the version
At least with avconv 11, it will print 'avconv version 11, ..' to stderr, not stdout.
-rw-r--r--youtube_dl/postprocessor/ffmpeg.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py
index e13deab4b..19fc135dc 100644
--- 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')