|
|
@@ -1262,9 +1262,9 @@ class YoutubeIE(InfoExtractor):
|
|
|
video_url_list = [(None, video_info['conn'][0])]
|
|
|
elif 'url_encoded_fmt_stream_map' in video_info and len(video_info['url_encoded_fmt_stream_map']) >= 1:
|
|
|
url_data_strs = video_info['url_encoded_fmt_stream_map'][0].split(',')
|
|
|
- url_data = [dict(pairStr.split('=') for pairStr in uds.split('&')) for uds in url_data_strs]
|
|
|
+ url_data = [parse_qs(uds) for uds in url_data_strs]
|
|
|
url_data = filter(lambda ud: 'itag' in ud and 'url' in ud, url_data)
|
|
|
- url_map = dict((ud['itag'], urllib.unquote(ud['url'])) for ud in url_data)
|
|
|
+ url_map = dict((ud['itag'][0], ud['url'][0]) for ud in url_data)
|
|
|
|
|
|
format_limit = self._downloader.params.get('format_limit', None)
|
|
|
if format_limit is not None and format_limit in self._available_formats:
|
|
|
@@ -2720,7 +2720,6 @@ class FacebookIE(InfoExtractor):
|
|
|
# Extension
|
|
|
video_extension = self._video_extensions.get(format_param, 'mp4')
|
|
|
|
|
|
- # Find the video URL in fmt_url_map or conn paramters
|
|
|
try:
|
|
|
# Process video information
|
|
|
self._downloader.process_info({
|
Philipp Hagemeister