[ted] fix extraction for http and rtmp formats(closes #5941)(closes #17572)(closes #17894)

This commit is contained in:
Remita Amine 2018-10-15 11:51:40 +01:00
parent 5d90a8a5f3
commit a94e7c195e

View file

@ -212,8 +212,6 @@ def _talk_info(self, url, video_name):
http_url = None http_url = None
for format_id, resources in resources_.items(): for format_id, resources in resources_.items():
if not isinstance(resources, dict):
continue
if format_id == 'h264': if format_id == 'h264':
for resource in resources: for resource in resources:
h264_url = resource.get('file') h264_url = resource.get('file')
@ -242,6 +240,8 @@ def _talk_info(self, url, video_name):
'tbr': int_or_none(resource.get('bitrate')), 'tbr': int_or_none(resource.get('bitrate')),
}) })
elif format_id == 'hls': elif format_id == 'hls':
if not isinstance(resources, dict):
continue
stream_url = url_or_none(resources.get('stream')) stream_url = url_or_none(resources.get('stream'))
if not stream_url: if not stream_url:
continue continue