]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[extractor/generic] Skip URLs we came from when delegating ISM extraction
authorSergey M․ <dstftw@gmail.com>
Wed, 2 Nov 2016 16:43:41 +0000 (23:43 +0700)
committerSergey M․ <dstftw@gmail.com>
Wed, 2 Nov 2016 16:43:41 +0000 (23:43 +0700)
youtube_dl/extractor/generic.py

index 0bb263ce7710f2869e13b1e1ad5f33773c823a94..a0a45dce0589e7654fdfcd14bff9b7d5c0688a57 100644 (file)
@@ -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