diff options
| author | Filippo Valsorda <filosottile.wiki@gmail.com> | 2012-06-03 03:39:16 -0700 |
|---|---|---|
| committer | Filippo Valsorda <filosottile.wiki@gmail.com> | 2012-06-03 03:39:16 -0700 |
| commit | 17f3c40a31e6667bb7b18cbe7cf24e5728d7aabd (patch) | |
| tree | 64c9fe11279ec2547a096a6e697c88cd0f9b1484 /youtube_dl/__init__.py | |
| parent | a047951477096e6d5bb52f8ee37330a0104d95f0 (diff) | |
| parent | 505ed3088fdb1a1276de3403ef0fa19890138f48 (diff) | |
Merge pull request #353 from FiloSottile/avconv
check for avconv and ffmpeg, use as available; closes #344
Diffstat (limited to 'youtube_dl/__init__.py')
| -rw-r--r-- | youtube_dl/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
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') |