X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2FPostProcessor.py;h=b4262f9e4f18f84466f51c8fe8108a60fa6b34b4;hb=54041793389bc72def59a625dc59a4672cdb4825;hp=5971f089782f8f55aa8129f9cd54b2bc7673cc67;hpb=0b976545c70f9788157d1b224df4008471c7817b;p=youtube-dl.git

diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py
index 5971f0897..b4262f9e4 100644
--- a/youtube_dl/PostProcessor.py
+++ b/youtube_dl/PostProcessor.py
@@ -99,7 +99,7 @@ class FFmpegExtractAudioPP(PostProcessor):
 
 	def run_ffmpeg(self, path, out_path, codec, more_opts):
 		if not self._exes['ffmpeg'] and not self._exes['avconv']:
-			raise AudioConversionError('ffmpeg or avconv not found. Please install avconv.')	
+			raise AudioConversionError('ffmpeg or avconv not found. Please install one.')	
 		if codec is None:
 			acodec_opts = []
 		else:
@@ -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'[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 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.