From: Philipp Hagemeister Date: Wed, 23 Oct 2013 09:40:46 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=365bcf6d975281ad769200cc8616872d0b6d6607;hp=71907db3ba28b1d32c3294d9e3bec0c08fb98ad3;p=youtube-dl Merge remote-tracking branch 'origin/master' --- diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index a88cba2b4..7a7bbe265 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -236,11 +236,13 @@ class YoutubeIE(YoutubeBaseInfoExtractor, SubtitlesInfoExtractor): '136': 'mp4', '137': 'mp4', '138': 'mp4', - '139': 'mp4', - '140': 'mp4', - '141': 'mp4', '160': 'mp4', + # Dash mp4 audio + '139': 'm4a', + '140': 'm4a', + '141': 'm4a', + # Dash webm '171': 'webm', '172': 'webm',