aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorFilippo Valsorda <filippo.valsorda@gmail.com>2012-05-31 22:42:25 +0200
committerFilippo Valsorda <filippo.valsorda@gmail.com>2012-06-03 12:11:39 +0200
commit505ed3088fdb1a1276de3403ef0fa19890138f48 (patch)
tree64c9fe11279ec2547a096a6e697c88cd0f9b1484 /youtube_dl
parent0b976545c70f9788157d1b224df4008471c7817b (diff)
normalize ffmpeg/avconv names printing
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/PostProcessor.py6
-rw-r--r--youtube_dl/__init__.py4
2 files changed, 5 insertions, 5 deletions
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.
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 827b58264..f10822db1 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -293,11 +293,11 @@ def parseOpts():
postproc.add_option('--extract-audio', action='store_true', dest='extractaudio', default=False,
- help='convert video files to audio-only files (requires ffmpeg and ffprobe)')
+ help='convert video files to audio-only files (requires ffmpeg or avconv and ffprobe or avprobe)')
postproc.add_option('--audio-format', metavar='FORMAT', dest='audioformat', default='best',
help='"best", "aac", "vorbis", "mp3", "m4a", or "wav"; best by default')
postproc.add_option('--audio-quality', metavar='QUALITY', dest='audioquality', default='128K',
- help='ffmpeg audio bitrate specification, 128k by default')
+ help='ffmpeg/avconv audio bitrate specification, 128k by default')
postproc.add_option('-k', '--keep-video', action='store_true', dest='keepvideo', default=False,
help='keeps the video file on disk after the post-processing; the video is erased by default')