diff options
| author | Sergey M․ <dstftw@gmail.com> | 2015-07-16 01:15:47 +0600 | 
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2015-07-16 01:15:47 +0600 | 
| commit | f01f731107010e0c10fc94782daa7a3ba543e92a (patch) | |
| tree | bb2f872ca60e4451807844aa79669b6c325100dc | |
| parent | 70f0f5a8ca53d4426fc079b3ab46e9d4a8e81ea4 (diff) | |
[prosiebensat1] Use generic f4m manifest extraction
| -rw-r--r-- | youtube_dl/extractor/prosiebensat1.py | 13 | 
1 files changed, 3 insertions, 10 deletions
| diff --git a/youtube_dl/extractor/prosiebensat1.py b/youtube_dl/extractor/prosiebensat1.py index 22efa903f..2f9d95800 100644 --- a/youtube_dl/extractor/prosiebensat1.py +++ b/youtube_dl/extractor/prosiebensat1.py @@ -9,7 +9,7 @@ from ..compat import (      compat_urllib_parse,  )  from ..utils import ( -    fix_xml_ampersands, +    determine_ext,      int_or_none,      unified_strdate,  ) @@ -295,15 +295,8 @@ class ProSiebenSat1IE(InfoExtractor):                      'ext': 'mp4',                      'format_id': '%s_%s' % (source['cdn'], source['bitrate']),                  }) -            elif 'f4mgenerator' in source_url: -                manifest = self._download_xml( -                    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')) +            elif 'f4mgenerator' in source_url or determine_ext(source_url) == 'f4m': +                formats.extend(self._extract_f4m_formats(source_url, clip_id))              else:                  formats.append({                      'url': source_url, | 
