aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippo Valsorda <filippo.valsorda@gmail.com>2012-07-14 14:35:57 +0200
committerFilippo Valsorda <filippo.valsorda@gmail.com>2012-07-14 14:35:57 +0200
commitcca4828ac94e6d2e4e1918405d0fcbc8e6ac92d0 (patch)
treed9996f132d9f184abff143bdab51a6509e92b555
parentd4e16d3e9736fd4419b8bd2b088b5dec086ae07d (diff)
fixed a logic bug in post-processing
-rwxr-xr-xyoutube-dlbin40554 -> 40554 bytes
-rw-r--r--youtube_dl/PostProcessor.py4
2 files changed, 2 insertions, 2 deletions
diff --git a/youtube-dl b/youtube-dl
index d89b5a984..b3e0cd422 100755
--- a/youtube-dl
+++ b/youtube-dl
Binary files 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.