summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2016-11-02 23:43:41 +0700
committerSergey M․ <dstftw@gmail.com>2016-11-02 23:43:41 +0700
commit4119a96ce57b11437efd329a8c2602ee7fa7ea2c (patch)
tree84107ddd860bde6b1ba57bc687d8e9fefefdd00f
parent26aae566902251f9674593a2b0f0ca7477b96a56 (diff)
downloadyoutube-dl-4119a96ce57b11437efd329a8c2602ee7fa7ea2c.tar.gz
youtube-dl-4119a96ce57b11437efd329a8c2602ee7fa7ea2c.tar.xz
youtube-dl-4119a96ce57b11437efd329a8c2602ee7fa7ea2c.zip
[extractor/generic] Skip URLs we came from when delegating ISM extraction
-rw-r--r--youtube_dl/extractor/generic.py2
1 files changed, 1 insertions, 1 deletions
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