]> git.bitcoin.ninja Git - youtube-dl/commitdiff
YoutubeIE: extract the correct video id for movie URLs (closes #597)
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Mon, 1 Jul 2013 14:51:18 +0000 (16:51 +0200)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Mon, 1 Jul 2013 14:51:18 +0000 (16:51 +0200)
youtube_dl/extractor/youtube.py

index 109c8a93fa9ca7cb4caeca87462e1385a802bb69..656f46f219ebadedf9e25458367550f6d6e72e25 100644 (file)
@@ -34,7 +34,7 @@ class YoutubeIE(InfoExtractor):
                          (?:                                                  # the various things that can precede the ID:
                              (?:(?:v|embed|e)/)                               # v/ or embed/ or e/
                              |(?:                                             # or the v= param in all its forms
-                                 (?:watch(?:_popup)?(?:\.php)?)?              # preceding watch(_popup|.php) or nothing (like /?v=xxxx)
+                                 (?:watch|movie(?:_popup)?(?:\.php)?)?              # preceding watch(_popup|.php) or nothing (like /?v=xxxx)
                                  (?:\?|\#!?)                                  # the params delimiter ? or # or #!
                                  (?:.*?&)?                                    # any other preceding param (like /?s=tuff&v=xxxx)
                                  v=