From 0217c783771a6c8543046869e934f4ced56febc7 Mon Sep 17 00:00:00 2001 From: Philipp Hagemeister Date: Thu, 8 Jan 2015 16:14:16 +0100 Subject: [YoutubeDL] Allow selection by more extensions --- youtube_dl/YoutubeDL.py | 2 +- youtube_dl/options.py | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'youtube_dl') diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 36c71f947..24d6c2de7 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -786,7 +786,7 @@ class YoutubeDL(object): if video_formats: return video_formats[0] else: - extensions = ['mp4', 'flv', 'webm', '3gp', 'm4a'] + extensions = ['mp4', 'flv', 'webm', '3gp', 'm4a', 'mp3', 'ogg', 'aac', 'wav'] if format_spec in extensions: filter_f = lambda f: f['ext'] == format_spec else: diff --git a/youtube_dl/options.py b/youtube_dl/options.py index a018c1d71..058342dec 100644 --- a/youtube_dl/options.py +++ b/youtube_dl/options.py @@ -267,10 +267,12 @@ def parseOpts(overrideArguments=None): action='store', dest='format', metavar='FORMAT', default=None, help=( 'video format code, specify the order of preference using' - ' slashes: -f 22/17/18 . -f mp4 , -f m4a and -f flv are also' - ' supported. You can also use the special names "best",' - ' "bestvideo", "bestaudio", "worst", "worstvideo" and' - ' "worstaudio". By default, youtube-dl will pick the best quality.' + ' slashes, as in -f 22/17/18 . ' + ' Instead of format codes, you can select by extension for the ' + 'extensions aac, m4a, mp3, mp4, ogg, wav, webm. ' + 'You can also use the special names "best",' + ' "bestvideo", "bestaudio", "worst". ' + ' By default, youtube-dl will pick the best quality.' ' Use commas to download multiple audio formats, such as' ' -f 136/137/mp4/bestvideo,140/m4a/bestaudio.' ' You can merge the video and audio of two formats into a single' -- cgit v1.2.3