projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[discovery] extract subtitle
[youtube-dl]
/
youtube_dl
/
extractor
/
ard.py
diff --git
a/youtube_dl/extractor/ard.py
b/youtube_dl/extractor/ard.py
index 73be6d2040b7197a94939ddbe5f3d7f81a92b750..26446c2fe1e4ecb0b15b6ec87a927a2b6151a1da 100644
(file)
--- a/
youtube_dl/extractor/ard.py
+++ b/
youtube_dl/extractor/ard.py
@@
-83,7
+83,7
@@
class ARDMediathekIE(InfoExtractor):
subtitle_url = media_info.get('_subtitleUrl')
if subtitle_url:
subtitles['de'] = [{
subtitle_url = media_info.get('_subtitleUrl')
if subtitle_url:
subtitles['de'] = [{
- 'ext': '
srt
',
+ 'ext': '
ttml
',
'url': subtitle_url,
}]
'url': subtitle_url,
}]
@@
-110,13
+110,15
@@
class ARDMediathekIE(InfoExtractor):
server = stream.get('_server')
for stream_url in stream_urls:
ext = determine_ext(stream_url)
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(
stream_url + '?hdcore=3.1.1&plugin=aasp-3.1.1.69.124',
if ext == 'f4m':
formats.extend(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
))
elif ext == 'm3u8':
formats.extend(self._extract_m3u8_formats(
elif ext == 'm3u8':
formats.extend(self._extract_m3u8_formats(
- stream_url, video_id, 'mp4', preference=1, m3u8_id='hls'))
+ stream_url, video_id, 'mp4', preference=1, m3u8_id='hls'
, fatal=False
))
else:
if server and server.startswith('rtmp'):
f = {
else:
if server and server.startswith('rtmp'):
f = {