Merge tag 'upstream/2017.02.24.1'

[youtubedl] / youtube_dl / extractor / vier.py

diff --git a/youtube_dl/extractor/vier.py b/youtube_dl/extractor/vier.py
index c76c20614e49b7468234aed68a985f6476fe1d0a..d26fb49b3939728e8a962b2ad3131c71fd223366 100644 (file)
--- a/youtube_dl/extractor/vier.py
+++ b/youtube_dl/extractor/vier.py
@@ -48,8 +48,9 @@ class VierIE(InfoExtractor):
             [r'data-filename="([^"]+)"', r'"filename"\s*:\s*"([^"]+)"'],
             webpage, 'filename')
 
             [r'data-filename="([^"]+)"', r'"filename"\s*:\s*"([^"]+)"'],
             webpage, 'filename')
 

-        playlist_url = 'http://vod.streamcloud.be/%s/mp4:_definst_/%s.mp4/playlist.m3u8' % (application, filename)
-        formats = self._extract_m3u8_formats(playlist_url, display_id, 'mp4')
+        playlist_url = 'http://vod.streamcloud.be/%s/_definst_/mp4:%s.mp4/playlist.m3u8' % (application, filename)
+        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)
         description = self._og_search_description(webpage, default=None)
 
         title = self._og_search_title(webpage, default=display_id)
         description = self._og_search_description(webpage, default=None)