From cca4828ac94e6d2e4e1918405d0fcbc8e6ac92d0 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Sat, 14 Jul 2012 14:35:57 +0200 Subject: [PATCH] fixed a logic bug in post-processing --- youtube-dl | Bin 40554 -> 40554 bytes youtube_dl/PostProcessor.py | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/youtube-dl b/youtube-dl index d89b5a9841b2ba633eebb0c6d3d9dfe381db2c4f..b3e0cd4221b302881fc5ad75746dd5fc9ad0c7fd 100755 GIT binary patch delta 2554 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 K{+t|>aGm-OH09?2 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.