]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[metacafe] Fix video url extraction (closes #7763)
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sat, 5 Dec 2015 15:12:02 +0000 (16:12 +0100)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sat, 5 Dec 2015 15:12:02 +0000 (16:12 +0100)
youtube_dl/extractor/metacafe.py

index 3c786a36dfb6c8908668cdf3191e660487862c82..5b0b4260861c4e30104d238e557b88a3e1aa952b 100644 (file)
@@ -154,10 +154,10 @@ class MetacafeIE(InfoExtractor):
         # Extract URL, uploader and title from webpage
         self.report_extraction(video_id)
         video_url = None
-        mobj = re.search(r'(?m)&mediaURL=([^&]+)', webpage)
+        mobj = re.search(r'(?m)&(?:media|video)URL=([^&]+)', webpage)
         if mobj is not None:
             mediaURL = compat_urllib_parse_unquote(mobj.group(1))
-            video_ext = mediaURL[-3:]
+            video_ext = determine_ext(mediaURL)
 
             # Extract gdaKey if available
             mobj = re.search(r'(?m)&gdaKey=(.*?)&', webpage)