schmittlauch/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[abcnews] Added a new extractor (closes #3992)

Browse source 
Related: #6108, #8664, #9459
This commit is contained in:
Yen Chi Hsuan 2016-05-17 15:38:57 +08:00
parent cdd94c2eae
commit 055f0d3d06
No known key found for this signature in database
GPG key ID: 3FDDD575826C5C30
3 changed files with 141 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
youtube_dl/extractor/amp.py
View file

@ -52,7 +52,7 @@ class AMPIE(InfoExtractor):
for media_data in media_content:
media = media_data['@attributes']
media_type = media['type']
if media_type == 'video/f4m':
if media_type in ('video/f4m', 'application/f4m+xml'):
formats.extend(self._extract_f4m_formats(
media['url'] + '?hdcore=3.4.0&plugin=aasp-3.4.0.132.124',
video_id, f4m_id='hds', fatal=False))
@ -61,7 +61,7 @@ class AMPIE(InfoExtractor):
media['url'], video_id, 'mp4', m3u8_id='hls', fatal=False))
else:
formats.append({
'format_id': media_data['media-category']['@attributes']['label'],
'format_id': media_data.get('media-category', {}).get('@attributes', {}).get('label'),
'url': media['url'],
'tbr': int_or_none(media.get('bitrate')),
'filesize': int_or_none(media.get('fileSize')),