From: Sergey M․ Date: Wed, 2 Nov 2016 16:43:41 +0000 (+0700) Subject: [extractor/generic] Skip URLs we came from when delegating ISM extraction X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=4119a96ce57b11437efd329a8c2602ee7fa7ea2c;p=youtube-dl [extractor/generic] Skip URLs we came from when delegating ISM extraction --- diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 0bb263ce7..a0a45dce0 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -2453,7 +2453,7 @@ class GenericIE(InfoExtractor): entry_info_dict['formats'] = self._extract_mpd_formats(video_url, video_id) elif ext == 'f4m': entry_info_dict['formats'] = self._extract_f4m_formats(video_url, video_id) - elif re.search(r'(?i)\.(?:ism|smil)/manifest', video_url): + elif re.search(r'(?i)\.(?:ism|smil)/manifest', video_url) and video_url != url: # Just matching .ism/manifest is not enough to be reliably sure # whether it's actually an ISM manifest or some other streaming # manifest since there are various streaming URL formats