Merge tag 'upstream/2015.06.04.1'

[youtubedl] / youtube_dl / extractor / teamcoco.py

diff --git a/youtube_dl/extractor/teamcoco.py b/youtube_dl/extractor/teamcoco.py
index 56be526383b590d9b00759400a269d5164beef2f..b2a4b1fc05430558ad9b33a9aa3ce834107dc6e3 100644 (file)
--- a/youtube_dl/extractor/teamcoco.py
+++ b/youtube_dl/extractor/teamcoco.py
@@ -10,6 +10,7 @@ from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
     qualities,
 from ..utils import (
     ExtractorError,
     qualities,

+    determine_ext,

 )
 from ..compat import compat_ord
 
 )
 from ..compat import compat_ord
 


@@ -108,7 +109,7 @@ class TeamcocoIE(InfoExtractor):
         formats = []
         get_quality = qualities(['500k', '480p', '1000k', '720p', '1080p'])
         for filed in data['files']:
         formats = []
         get_quality = qualities(['500k', '480p', '1000k', '720p', '1080p'])
         for filed in data['files']:

-            if filed['type'] == 'hls':
+            if determine_ext(filed['url']) == 'm3u8':

                 formats.extend(self._extract_m3u8_formats(
                     filed['url'], video_id, ext='mp4'))
             else:
                 formats.extend(self._extract_m3u8_formats(
                     filed['url'], video_id, ext='mp4'))
             else: