xZero707/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-27 14:15:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

[prosiebensat1] Use generic f4m manifest extraction

Browse Source
This commit is contained in:
Sergey M․ 2015-07-16 01:15:47 +06:00
parent 70f0f5a8ca
commit f01f731107
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
youtube_dl/extractor/prosiebensat1.py
View File

@ -9,7 +9,7 @@ from ..compat import (
compat_urllib_parse, compat_urllib_parse,
) )
from ..utils import ( from ..utils import (
fix_xml_ampersands, determine_ext,
int_or_none, int_or_none,
unified_strdate, unified_strdate,
) )
@ -295,15 +295,8 @@ class ProSiebenSat1IE(InfoExtractor):
'ext': 'mp4', 'ext': 'mp4',
'format_id': '%s_%s' % (source['cdn'], source['bitrate']), 'format_id': '%s_%s' % (source['cdn'], source['bitrate']),
}) })
elif 'f4mgenerator' in source_url: elif 'f4mgenerator' in source_url or determine_ext(source_url) == 'f4m':
manifest = self._download_xml( formats.extend(self._extract_f4m_formats(source_url, clip_id))
source_url, clip_id, 'Downloading generated f4m manifest',
transform_source=lambda s: fix_xml_ampersands(s).strip())
for media in manifest.findall('./{http://ns.adobe.com/f4m/2.0}media'):
manifest_url = media.get('href')
if manifest_url:
formats.extend(self._extract_f4m_formats(
manifest_url, clip_id, f4m_id='hds'))
else: else:
formats.append({ formats.append({
'url': source_url, 'url': source_url,