From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Sun, 19 Aug 2012 21:25:16 +0000 (+0200)
Subject: tweaked the --audio-quality input validation/specification
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=3a68d7b467d59e6df4d8473989dcd9edb460dd75;p=youtube-dl.git

tweaked the --audio-quality input validation/specification
---

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
Binary files a/youtube-dl and b/youtube-dl differ
diff --git a/youtube-dl.exe b/youtube-dl.exe
index c55f5fa8d..bf8ed478b 100755
Binary files a/youtube-dl.exe and b/youtube-dl.exe 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({