|
|
@ -25,6 +25,7 @@ from ..utils import (
|
|
|
|
parse_resolution,
|
|
|
|
parse_resolution,
|
|
|
|
smuggle_url,
|
|
|
|
smuggle_url,
|
|
|
|
str_or_none,
|
|
|
|
str_or_none,
|
|
|
|
|
|
|
|
traverse_obj,
|
|
|
|
try_call,
|
|
|
|
try_call,
|
|
|
|
unescapeHTML,
|
|
|
|
unescapeHTML,
|
|
|
|
unified_timestamp,
|
|
|
|
unified_timestamp,
|
|
|
@ -2839,8 +2840,9 @@ class GenericIE(InfoExtractor):
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
info = self._parse_jwplayer_data(
|
|
|
|
info = self._parse_jwplayer_data(
|
|
|
|
jwplayer_data, video_id, require_title=False, base_url=url)
|
|
|
|
jwplayer_data, video_id, require_title=False, base_url=url)
|
|
|
|
self.report_detected('JW Player data')
|
|
|
|
if traverse_obj(info, 'formats', ('entries', ..., 'formats')):
|
|
|
|
return merge_dicts(info, info_dict)
|
|
|
|
self.report_detected('JW Player data')
|
|
|
|
|
|
|
|
return merge_dicts(info, info_dict)
|
|
|
|
except ExtractorError:
|
|
|
|
except ExtractorError:
|
|
|
|
# See https://github.com/ytdl-org/youtube-dl/pull/16735
|
|
|
|
# See https://github.com/ytdl-org/youtube-dl/pull/16735
|
|
|
|
pass
|
|
|
|
pass
|
|
|
|