Compare commits

..

No commits in common. "169e8a368612f58c1226e1e3b53a8fc23bbe99ae" and "b62f6bfbf47a2ff603e3f8e2d007d95499c66c37" have entirely different histories.

View File

@ -2587,12 +2587,6 @@ class InfoExtractor:
elif 'fragments' in f: elif 'fragments' in f:
formats[format_key].setdefault('fragments', []).extend(f['fragments']) formats[format_key].setdefault('fragments', []).extend(f['fragments'])
if len(period['subtitles']) > 0 and len(subtitles) > 0:
self.report_warning(bug_reports_message(
'Found subtitles in multiple periods in the DASH manifest; '
'if part of the subtitles are missing,'
), only_once=True)
for sub_lang, sub_info in period['subtitles'].items(): for sub_lang, sub_info in period['subtitles'].items():
subtitles.setdefault(sub_lang, []).extend(sub_info) subtitles.setdefault(sub_lang, []).extend(sub_info)
@ -2936,7 +2930,8 @@ class InfoExtractor:
period_entry['formats'].append(f) period_entry['formats'].append(f)
elif content_type == 'text': elif content_type == 'text':
period_entry['subtitles'][lang or 'und'].append(f) period_entry['subtitles'][lang or 'und'].append(f)
yield period_entry if period_entry['formats'] or period_entry['subtitles']:
yield period_entry
def _extract_ism_formats(self, *args, **kwargs): def _extract_ism_formats(self, *args, **kwargs):
fmts, subs = self._extract_ism_formats_and_subtitles(*args, **kwargs) fmts, subs = self._extract_ism_formats_and_subtitles(*args, **kwargs)