diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-12-11 16:28:10 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-12-11 16:28:10 +0100 |
| commit | 9684f17cdef0b36f1c20683192d1604518c012e6 (patch) | |
| tree | b4495422b8e66a6d9d18256602fb7a76061f0eb6 /youtube_dl | |
| parent | e52a40abf7519ba38a0607ea2069e39d684a12e2 (diff) | |
| parent | 24270b0301aacc307688d1da71ee0de6e24f3197 (diff) | |
| download | youtube-dl-9684f17cdef0b36f1c20683192d1604518c012e6.zip youtube-dl-9684f17cdef0b36f1c20683192d1604518c012e6.tar.gz youtube-dl-9684f17cdef0b36f1c20683192d1604518c012e6.tar.bz2 | |
Merge remote-tracking branch 'akretz/youtube_fix'
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/youtube.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 4f6898c..f8d5cdd 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -944,7 +944,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor, SubtitlesInfoExtractor): 'url': video_info['conn'][0], 'player_url': player_url, }] - elif len(video_info.get('url_encoded_fmt_stream_map', [])) >= 1 or len(video_info.get('adaptive_fmts', [])) >= 1: + elif len(video_info.get('url_encoded_fmt_stream_map', [''])[0]) >= 1 or len(video_info.get('adaptive_fmts', [''])[0]) >= 1: encoded_url_map = video_info.get('url_encoded_fmt_stream_map', [''])[0] + ',' + video_info.get('adaptive_fmts', [''])[0] if 'rtmpe%3Dyes' in encoded_url_map: raise ExtractorError('rtmpe downloads are not supported, see https://github.com/rg3/youtube-dl/issues/343 for more information.', expected=True) |