X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Fscreenwavemedia.py;h=44b0bbee68953a199c67e420fe1928048be5f2cf;hb=065c4b27bfc4488758b357e023e9b6b1679c9641;hp=d2af26c1ccf57377420b0594874525e9713dde22;hpb=6c10dbeae948b491b538f70481ee5b348a636067;p=youtube-dl

diff --git a/youtube_dl/extractor/screenwavemedia.py b/youtube_dl/extractor/screenwavemedia.py
index d2af26c1c..44b0bbee6 100644
--- a/youtube_dl/extractor/screenwavemedia.py
+++ b/youtube_dl/extractor/screenwavemedia.py
@@ -76,9 +76,11 @@ class ScreenwaveMediaIE(InfoExtractor):
             if source.get('type') == 'hls':
                 formats.extend(self._extract_m3u8_formats(file_, video_id, ext='mp4'))
             else:
-                format_label = source.get('label')
                 format_id = self._search_regex(
                     r'_(.+?)\.[^.]+$', file_, 'format id', default=None)
+                if not self._is_valid_url(file_, video_id, format_id or 'video'):
+                    continue
+                format_label = source.get('label')
                 height = int_or_none(self._search_regex(
                     r'^(\d+)[pP]', format_label, 'height', default=None))
                 formats.append({
@@ -88,7 +90,7 @@ class ScreenwaveMediaIE(InfoExtractor):
                     'ext': source.get('type'),
                     'height': height,
                 })
-        self._sort_formats(formats)
+        self._sort_formats(formats, field_preference=('height', 'width', 'tbr', 'format_id'))
 
         return {
             'id': video_id,