summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-12-11 16:28:10 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-12-11 16:28:10 +0100
commit9684f17cdef0b36f1c20683192d1604518c012e6 (patch)
treeb4495422b8e66a6d9d18256602fb7a76061f0eb6
parente52a40abf7519ba38a0607ea2069e39d684a12e2 (diff)
parent24270b0301aacc307688d1da71ee0de6e24f3197 (diff)
downloadyoutube-dl-9684f17cdef0b36f1c20683192d1604518c012e6.tar.gz
youtube-dl-9684f17cdef0b36f1c20683192d1604518c012e6.tar.xz
youtube-dl-9684f17cdef0b36f1c20683192d1604518c012e6.zip
Merge remote-tracking branch 'akretz/youtube_fix'
-rw-r--r--youtube_dl/extractor/youtube.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py
index 4f6898c1a..f8d5cdd5d 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)