aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippo Valsorda <filippo.valsorda@gmail.com>2012-08-19 23:25:16 +0200
committerFilippo Valsorda <filippo.valsorda@gmail.com>2012-08-19 23:25:16 +0200
commit3a68d7b467d59e6df4d8473989dcd9edb460dd75 (patch)
tree796ee4a66621b2f821b9b2a481f6315f6a270f3b
parentb24676ce888c6b597b7e9ca6bb0fca82d71f2ec5 (diff)
tweaked the --audio-quality input validation/specification
-rw-r--r--README.md4
-rwxr-xr-xyoutube-dlbin40634 -> 40680 bytes
-rwxr-xr-xyoutube-dl.exebin3989631 -> 3989800 bytes
-rw-r--r--youtube_dl/__init__.py6
4 files changed, 7 insertions, 3 deletions
diff --git a/README.md b/README.md
index 34f5bf723..8a6742d94 100644
--- a/README.md
+++ b/README.md
@@ -91,8 +91,8 @@ which means you can modify it, redistribute it or use it however you like.
--audio-format FORMAT "best", "aac", "vorbis", "mp3", "m4a", or "wav";
best by default
--audio-quality QUALITY ffmpeg/avconv audio quality specification, insert a
- value between 0 (highest) and 9 (lowest) or a
- specific bitrate like 128 (default 5)
+ value between 0 (better) and 9 (worse) for VBR or a
+ specific bitrate like 128K (default 5)
-k, --keep-video keeps the video file on disk after the post-
processing; the video is erased by default
diff --git a/youtube-dl b/youtube-dl
index 67f6f0c36..913619d6d 100755
--- a/youtube-dl
+++ b/youtube-dl
Binary files differ
diff --git a/youtube-dl.exe b/youtube-dl.exe
index c55f5fa8d..bf8ed478b 100755
--- a/youtube-dl.exe
+++ b/youtube-dl.exe
Binary files differ
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 2bc9a3fa6..8817228f3 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -297,7 +297,7 @@ def parseOpts():
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='5',
- help='ffmpeg/avconv audio quality specification, insert a value between 0 (highest) and 9 (lowest) or a specific bitrate like 128 (default 5)')
+ help='ffmpeg/avconv audio quality specification, insert a value between 0 (better) and 9 (worse) for VBR or a specific bitrate like 128K (default 5)')
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')
@@ -443,6 +443,10 @@ def _real_main():
if opts.extractaudio:
if opts.audioformat not in ['best', 'aac', 'mp3', 'vorbis', 'm4a', 'wav']:
parser.error(u'invalid audio format specified')
+ if opts.audioquality:
+ opts.audioquality = opts.audioquality.strip('k').strip('K')
+ if not opts.audioquality.isdigit():
+ parser.error(u'invalid audio quality specified')
# File downloader
fd = FileDownloader({