From 505ed3088fdb1a1276de3403ef0fa19890138f48 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Thu, 31 May 2012 22:42:25 +0200 Subject: [PATCH] normalize ffmpeg/avconv names printing --- README.md | 5 +++-- youtube_dl/PostProcessor.py | 6 +++--- youtube_dl/__init__.py | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 859ca663cd..f04b96128d 100644 --- a/README.md +++ b/README.md @@ -87,10 +87,11 @@ which means you can modify it, redistribute it or use it however you like. ### Post-processing Options: --extract-audio convert video files to audio-only files (requires - ffmpeg and ffprobe) + ffmpeg or avconv and ffprobe or avprobe) --audio-format FORMAT "best", "aac", "vorbis", "mp3", "m4a", or "wav"; best by default - --audio-quality QUALITY ffmpeg audio bitrate specification, 128k by default + --audio-quality QUALITY ffmpeg/avconv audio bitrate specification, 128k by + default -k, --keep-video keeps the video file on disk after the post- processing; the video is erased by default diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py index 5971f08978..b4262f9e4f 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 827b58264f..f10822db19 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')