Merge remote-tracking branch 'origin/master'

This commit is contained in:
Philipp Hagemeister 2013-10-23 11:40:46 +02:00
commit 365bcf6d97

View file

@ -236,11 +236,13 @@ class YoutubeIE(YoutubeBaseInfoExtractor, SubtitlesInfoExtractor):
'136': 'mp4', '136': 'mp4',
'137': 'mp4', '137': 'mp4',
'138': 'mp4', '138': 'mp4',
'139': 'mp4',
'140': 'mp4',
'141': 'mp4',
'160': 'mp4', '160': 'mp4',
# Dash mp4 audio
'139': 'm4a',
'140': 'm4a',
'141': 'm4a',
# Dash webm # Dash webm
'171': 'webm', '171': 'webm',
'172': 'webm', '172': 'webm',