From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Sun, 12 May 2013 17:08:32 +0000 (+0200)
Subject: FFmpegPostProcessor: decode stderr first and then get the last line (closes #837)
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=fb2f83360cc48b2b2fbc27c268437688094032b6;p=youtube-dl

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

diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py
index 0c6885dda..8868b37af 100644
--- 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