youtube-dl

commit 0384932e3d3566835014f8f48edd47d2ccfa4ea9
parent edd6074ceac8b879382f9000cf8883b5e357776e
Author: Remita Amine <remitamine@gmail.com>
Date:   Wed, 19 Oct 2016 14:57:12 +0100

[extractor/common] try to extract non smil wowza mpd manifests

Diffstat:
M
youtube_dl/extractor/common.py
 | 
8
++++----
M
youtube_dl/extractor/vier.py
 | 
2
+-

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
@@ -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',
diff --git a/youtube_dl/extractor/vier.py b/youtube_dl/extractor/vier.py
@@ -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)