Add comment about weird .video extension for format 38

[youtube-dl] / youtube-dl

diff --git a/youtube-dl b/youtube-dl
index 08297e2e0664d9916331d7363359acf66cc32527..481f9f400422149f552a490847558fb8cf43e960 100755 (executable)
--- a/youtube-dl
+++ b/youtube-dl
@@ -680,7 +680,7 @@ class InfoExtractor(object):
 class YoutubeIE(InfoExtractor):
        """Information extractor for youtube.com."""
 
-       _VALID_URL = r'^((?:http://)?(?:\w+\.)?youtube\.com/(?:(?:v/)|(?:(?:watch(?:\.php)?)?[\?#](?:.+&)?v=)))?([0-9A-Za-z_-]+)(?(1).+)?$'
+       _VALID_URL = r'^((?:http://)?(?:youtu\.be/|(?:\w+\.)?youtube\.com/(?:(?:v/)|(?:(?:watch(?:_popup)?(?:\.php)?)?[\?#](?:.+&)?v=))))?([0-9A-Za-z_-]+)(?(1).+)?$'
        _LANG_URL = r'http://uk.youtube.com/?hl=en&persist_hl=1&gl=US&persist_gl=1&opt_out_ackd=1'
        _LOGIN_URL = 'http://www.youtube.com/signup?next=/&gl=US&hl=en'
        _AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en'
@@ -693,7 +693,7 @@ class YoutubeIE(InfoExtractor):
                '18': 'mp4',
                '22': 'mp4',
                '37': 'mp4',
-               '38': 'video',
+               '38': 'video', # You actually don't know if this will be MOV, AVI or whatever
                '43': 'webm',
                '45': 'webm',
        }
@@ -847,7 +847,7 @@ class YoutubeIE(InfoExtractor):
                                return
 
                        # Attempt to extract SWF player URL
-                       mobj = re.search(r'swfConfig.*"(http://.*?watch-.*?\.swf)"', video_webpage)
+                       mobj = re.search(r'swfConfig.*"(http://.*?watch.*?-.*?\.swf)"', video_webpage)
                        if mobj is not None:
                                player_url = mobj.group(1)
                        else: