From: Filippo Valsorda Date: Sat, 14 Jul 2012 12:35:57 +0000 (+0200) Subject: fixed a logic bug in post-processing X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=cca4828ac94e6d2e4e1918405d0fcbc8e6ac92d0;p=youtube-dl fixed a logic bug in post-processing --- diff --git a/youtube-dl b/youtube-dl index d89b5a984..b3e0cd422 100755 Binary files a/youtube-dl and b/youtube-dl differ diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py index b4262f9e4..527dc3a3d 100644 --- 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.