From cca4828ac94e6d2e4e1918405d0fcbc8e6ac92d0 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <filippo.valsorda@gmail.com>
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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
Q1Tkj;P?P_h8<TLI`WqtQApigX

delta 2548
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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.