release 2013.06.27

[youtube] fix condition always being evaluated to true
[youtube] Use mp4 as extension for format 38 (Fixes #892 )
2013-06-24 10:32:08 +02:00 · 2013-06-24 09:42:46 +02:00 · 2013-06-24 01:22:59 +02:00
2 changed files with 3 additions and 3 deletions
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@@ -58,7 +58,7 @@ class YoutubeIE(InfoExtractor):
        '18': 'mp4',
        '22': 'mp4',
        '37': 'mp4',
-        '38': 'video', # You actually don't know if this will be MOV, AVI or whatever
+        '38': 'mp4',
        '43': 'webm',
        '44': 'webm',
        '45': 'webm',
@@ -486,7 +486,7 @@ class YoutubeIE(InfoExtractor):
            mobj = re.search(r';ytplayer.config = ({.*?});', video_webpage)
            info = json.loads(mobj.group(1))
            args = info['args']
-            if args.get('ptk','') == 'vevo' or 'dashmpd':
+            if args.get('ptk','') == 'vevo' or 'dashmpd' in args:
                # Vevo videos with encrypted signatures
                self.to_screen(u'%s: Vevo video detected.' % video_id)
                video_info['url_encoded_fmt_stream_map'] = [args['url_encoded_fmt_stream_map']]
--- a/youtube_dl/version.py
+++ b/youtube_dl/version.py
@@ -1,2 +1,2 @@

-__version__ = '2013.06.26'
+__version__ = '2013.06.27'
Author	SHA1	Message	Date
Philipp Hagemeister	2bc1820660	release 2013.06.27	2013-06-24 10:32:08 +02:00
Jaime Marquínez Ferrándiz	c7253e2e8c	[youtube] fix condition always being evaluated to true	2013-06-24 09:42:46 +02:00
Philipp Hagemeister	d69cf69a6a	[youtube] Use mp4 as extension for format 38 (Fixes #892 )	2013-06-24 01:22:59 +02:00