|
@ -378,21 +378,6 @@ class YoutubeIE(YoutubeBaseInfoExtractor, SubtitlesInfoExtractor): |
|
|
u"uploader_id": u"justintimberlakeVEVO" |
|
|
u"uploader_id": u"justintimberlakeVEVO" |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
{ |
|
|
|
|
|
u'url': u'https://www.youtube.com/watch?v=TGi3HqYrWHE', |
|
|
|
|
|
u'file': u'TGi3HqYrWHE.mp4', |
|
|
|
|
|
u'note': u'm3u8 video', |
|
|
|
|
|
u'info_dict': { |
|
|
|
|
|
u'title': u'Triathlon - Men - London 2012 Olympic Games', |
|
|
|
|
|
u'description': u'- Men - TR02 - Triathlon - 07 August 2012 - London 2012 Olympic Games', |
|
|
|
|
|
u'uploader': u'olympic', |
|
|
|
|
|
u'upload_date': u'20120807', |
|
|
|
|
|
u'uploader_id': u'olympic', |
|
|
|
|
|
}, |
|
|
|
|
|
u'params': { |
|
|
|
|
|
u'skip_download': True, |
|
|
|
|
|
}, |
|
|
|
|
|
}, |
|
|
|
|
|
] |
|
|
] |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -1480,7 +1465,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor, SubtitlesInfoExtractor): |
|
|
return |
|
|
return |
|
|
|
|
|
|
|
|
else: |
|
|
else: |
|
|
raise ExtractorError(u'no conn or url_encoded_fmt_stream_map information found in video info') |
|
|
|
|
|
|
|
|
raise ExtractorError(u'no conn, hlsvp or url_encoded_fmt_stream_map information found in video info') |
|
|
|
|
|
|
|
|
results = [] |
|
|
results = [] |
|
|
for format_param, video_real_url in video_url_list: |
|
|
for format_param, video_real_url in video_url_list: |
|
|