Detect more vevo videos
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sat, 22 Jun 2013 11:13:40 +0000 (13:13 +0200)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sat, 22 Jun 2013 11:13:40 +0000 (13:13 +0200)
youtube_dl/InfoExtractors.py

index a12bffbe396cf73a9088f7bd3a7e36a7102b70c0..2a748b17587fd2d5fb9237095ab73f24448e2092 100755 (executable)
@@ -727,10 +727,11 @@ class YoutubeIE(InfoExtractor):
         try:
             mobj = re.search(r';ytplayer.config = ({.*?});', video_webpage)
             info = json.loads(mobj.group(1))
-            if 'dashmpd' in info['args']:
+            args = info['args']
+            if args.get('ptk','') == 'vevo' or 'dashmpd':
                 # Vevo videos with encrypted signatures
                 self.to_screen(u'Vevo video detected.')
-                video_info['url_encoded_fmt_stream_map'] = [info['args']['url_encoded_fmt_stream_map']]
+                video_info['url_encoded_fmt_stream_map'] = [args['url_encoded_fmt_stream_map']]
         except ValueError:
             pass