about summary refs log tree commit diff
path: root/youtube_dl/extractor/spiegeltv.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-10-24 16:24:08 +0600
committerSergey M․ <dstftw@gmail.com>2015-10-24 16:24:08 +0600
commit50f01302d347738647262f9442bc4f5d06f013c6 (patch)
tree3b862c83e0577d32e7bb92060158a64f269ab720 /youtube_dl/extractor/spiegeltv.py
parent0198807ef95338bec69cfdcd67249c007e4d4141 (diff)
downloadyoutube-dl-50f01302d347738647262f9442bc4f5d06f013c6.tar.gz
youtube-dl-50f01302d347738647262f9442bc4f5d06f013c6.tar.xz
youtube-dl-50f01302d347738647262f9442bc4f5d06f013c6.zip
[spiegeltv] Do not extract m3u8 formats since it's already a format
Diffstat (limited to 'youtube_dl/extractor/spiegeltv.py')
-rw-r--r--youtube_dl/extractor/spiegeltv.py21
1 files changed, 10 insertions, 11 deletions
diff --git a/youtube_dl/extractor/spiegeltv.py b/youtube_dl/extractor/spiegeltv.py
index a85305281..d976bf33c 100644
--- a/youtube_dl/extractor/spiegeltv.py
+++ b/youtube_dl/extractor/spiegeltv.py
@@ -77,17 +77,16 @@ class SpiegeltvIE(InfoExtractor):
                     'rtmp_live': True,
                 })
             elif determine_ext(endpoint) == 'm3u8':
-                m3u8_formats = self._extract_m3u8_formats(
-                    endpoint.replace('[video]', play_path),
-                    video_id, 'm4v',
-                    preference=1,  # Prefer hls since it allows to workaround georestriction
-                    m3u8_id='hls', fatal=False)
-                if m3u8_formats is not False:
-                    for m3u8_format in m3u8_formats:
-                        m3u8_format['http_headers'] = {
-                            'Accept-Encoding': 'deflate', # gzip causes trouble on the server side
-                        }
-                    formats.extend(m3u8_formats)
+                formats.append({
+                    'url': endpoint.replace('[video]', play_path),
+                    'ext': 'm4v',
+                    'format_id': 'hls',  # Prefer hls since it allows to workaround georestriction
+                    'protocol': 'm3u8',
+                    'preference': 1,
+                    'http_headers': {
+                        'Accept-Encoding': 'deflate', # gzip causes trouble on the server side
+                    },
+                })
             else:
                 formats.append({
                     'url': endpoint,