youtube-dl

commit fb2f83360cc48b2b2fbc27c268437688094032b6
parent 3c5e7729e1ec3663f6cf2894b6e0474d76f2b206
Author: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date:   Sun, 12 May 2013 19:08:32 +0200

FFmpegPostProcessor: decode stderr first and then get the last line (closes #837)

Diffstat:
M
youtube_dl/PostProcessor.py
 | 
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py
@@ -85,8 +85,9 @@ class FFmpegPostProcessor(PostProcessor):
         p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         stdout,stderr = p.communicate()
         if p.returncode != 0:
+            stderr = stderr.decode('utf-8', 'replace')
             msg = stderr.strip().split('\n')[-1]
-            raise FFmpegPostProcessorError(msg.decode('utf-8', 'replace'))
+            raise FFmpegPostProcessorError(msg)
 
     def _ffmpeg_filename_argument(self, fn):
         # ffmpeg broke --, see https://ffmpeg.org/trac/ffmpeg/ticket/2127 for details