about summary refs log tree commit diff
path: root/youtube_dl/extractor/ard.py
diff options
context:
space:
mode:
authorremitamine <remitamine@gmail.com>2015-12-25 17:37:50 +0100
committerremitamine <remitamine@gmail.com>2015-12-25 17:37:50 +0100
commit1fc0b47fdf9367aa71e6b81076666f137e68f637 (patch)
tree10ec080c6e592f0ee6aaf94d7fff3e4618d739c9 /youtube_dl/extractor/ard.py
parent6418b2439b81ceec77b50879b4d9d395893d8eba (diff)
downloadyoutube-dl-1fc0b47fdf9367aa71e6b81076666f137e68f637.tar.gz
youtube-dl-1fc0b47fdf9367aa71e6b81076666f137e68f637.tar.xz
youtube-dl-1fc0b47fdf9367aa71e6b81076666f137e68f637.zip
[srmediathek] improve extraction
Diffstat (limited to 'youtube_dl/extractor/ard.py')
-rw-r--r--youtube_dl/extractor/ard.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/youtube_dl/extractor/ard.py b/youtube_dl/extractor/ard.py
index 73be6d204..687eb9f82 100644
--- a/youtube_dl/extractor/ard.py
+++ b/youtube_dl/extractor/ard.py
@@ -110,13 +110,19 @@ class ARDMediathekIE(InfoExtractor):
                 server = stream.get('_server')
                 for stream_url in stream_urls:
                     ext = determine_ext(stream_url)
+                    if quality != 'auto' and ext in ('f4m', 'm3u8'):
+                        continue
                     if ext == 'f4m':
-                        formats.extend(self._extract_f4m_formats(
+                        f4m_formats = self._extract_f4m_formats(
                             stream_url + '?hdcore=3.1.1&plugin=aasp-3.1.1.69.124',
-                            video_id, preference=-1, f4m_id='hds'))
+                            video_id, preference=-1, f4m_id='hds', fatal=False)
+                        if f4m_formats:
+                            formats.extend(f4m_formats)
                     elif ext == 'm3u8':
-                        formats.extend(self._extract_m3u8_formats(
-                            stream_url, video_id, 'mp4', preference=1, m3u8_id='hls'))
+                        m3u8_formats = self._extract_m3u8_formats(
+                            stream_url, video_id, 'mp4', preference=1, m3u8_id='hls', fatal=False)
+                        if m3u8_formats:
+                            formats.extend(m3u8_formats)
                     else:
                         if server and server.startswith('rtmp'):
                             f = {