diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-06-07 15:15:39 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-06-07 15:15:39 +0200 |
| commit | ac1390eee838d35b76d356e4e68bd430843d3439 (patch) | |
| tree | a2972df728f4806f1a4ea9d313c792a83396ad85 /youtube_dl/extractor/youtube.py | |
| parent | 4a5b4d34dc1db95871c6eca61d0fd3edb711743c (diff) | |
| parent | 63adb0cc617f136fb080e1df600360834d09b10c (diff) | |
Merge branch 'master' of github.com:rg3/youtube-dl
Conflicts:
youtube_dl/extractor/__init__.py
Diffstat (limited to 'youtube_dl/extractor/youtube.py')
| -rw-r--r-- | youtube_dl/extractor/youtube.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 2c51a0b47..7c50881c4 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -223,6 +223,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor, SubtitlesInfoExtractor): '246': {'ext': 'webm', 'height': 480, 'format_note': 'DASH video', 'acodec': 'none', 'preference': -40}, '247': {'ext': 'webm', 'height': 720, 'format_note': 'DASH video', 'acodec': 'none', 'preference': -40}, '248': {'ext': 'webm', 'height': 1080, 'format_note': 'DASH video', 'acodec': 'none', 'preference': -40}, + '271': {'ext': 'webm', 'height': 1440, 'format_note': 'DASH video', 'acodec': 'none', 'preference': -40}, # Dash webm audio '171': {'ext': 'webm', 'vcodec': 'none', 'format_note': 'DASH audio', 'abr': 48, 'preference': -50}, |