]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[extractor/common] try to extract non smil wowza mpd manifests
authorRemita Amine <remitamine@gmail.com>
Wed, 19 Oct 2016 13:57:12 +0000 (14:57 +0100)
committerRemita Amine <remitamine@gmail.com>
Wed, 19 Oct 2016 13:57:12 +0000 (14:57 +0100)
youtube_dl/extractor/common.py
youtube_dl/extractor/vier.py

index 0cbb97aae9727a0ca0cf2e149d54b5bf66371769..415dc84c82d537fad9493faf38d5348143a7e521 100644 (file)
@@ -1884,11 +1884,11 @@ class InfoExtractor(object):
             formats.extend(self._extract_f4m_formats(
                 http_base_url + '/manifest.f4m',
                 video_id, f4m_id='hds', fatal=False))
+        if 'dash' not in skip_protocols:
+            formats.extend(self._extract_mpd_formats(
+                http_base_url + '/manifest.mpd',
+                video_id, mpd_id='dash', fatal=False))
         if re.search(r'(?:/smil:|\.smil)', url_base):
-            if 'dash' not in skip_protocols:
-                formats.extend(self._extract_mpd_formats(
-                    http_base_url + '/manifest.mpd',
-                    video_id, mpd_id='dash', fatal=False))
             if 'smil' not in skip_protocols:
                 rtmp_formats = self._extract_smil_formats(
                     http_base_url + '/jwplayer.smil',
index dc142a245bcd765dc11200b8eb50fc342c5260f2..d26fb49b3939728e8a962b2ad3131c71fd223366 100644 (file)
@@ -49,7 +49,7 @@ class VierIE(InfoExtractor):
             webpage, 'filename')
 
         playlist_url = 'http://vod.streamcloud.be/%s/_definst_/mp4:%s.mp4/playlist.m3u8' % (application, filename)
-        formats = self._extract_wowza_formats(playlist_url, display_id)
+        formats = self._extract_wowza_formats(playlist_url, display_id, skip_protocols=['dash'])
         self._sort_formats(formats)
 
         title = self._og_search_title(webpage, default=display_id)