fixed a logic bug in post-processing

diff --git a/youtube-dl b/youtube-dl
index d89b5a9841b2ba633eebb0c6d3d9dfe381db2c4f..b3e0cd4221b302881fc5ad75746dd5fc9ad0c7fd 100755 (executable)
Binary files a/youtube-dl and b/youtube-dl differ

diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py
index b4262f9e4f18f84466f51c8fe8108a60fa6b34b4..527dc3a3d73d4c671c922dca261046390117bdce 100644 (file)
--- a/youtube_dl/PostProcessor.py
+++ b/youtube_dl/PostProcessor.py
@@ -162,7 +162,7 @@ class FFmpegExtractAudioPP(PostProcessor):
 
                prefix, sep, ext = path.rpartition(u'.') # not os.path.splitext, since the latter does not work on unicode in all setups
                new_path = prefix + sep + extension
-               self._downloader.to_screen(u'[' + self._exes['avconv'] and 'avconv' or 'ffmpeg' + '] Destination: ' + new_path)
+               self._downloader.to_screen(u'[' + (self._exes['avconv'] and 'avconv' or 'ffmpeg') + '] Destination: ' + new_path)
                try:
                        self.run_ffmpeg(path, new_path, acodec, more_opts)
                except:
@@ -170,7 +170,7 @@ class FFmpegExtractAudioPP(PostProcessor):
                        if isinstance(e, AudioConversionError):
                                self._downloader.to_stderr(u'ERROR: audio conversion failed: ' + e.message)
                        else:
-                               self._downloader.to_stderr(u'ERROR: error running ' + self._exes['avconv'] and 'avconv' or 'ffmpeg')
+                               self._downloader.to_stderr(u'ERROR: error running ' + (self._exes['avconv'] and 'avconv' or 'ffmpeg'))
                        return None
 
                # Try to update the date time for extracted audio file.