summary refs log tree commit diff
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-07-01 16:51:18 +0200
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-07-01 16:51:18 +0200
commitbcd6e4bd07fb924e3de37ed46f21c46debdebaa8 (patch)
tree1541e09f52f7e3d86904a2c142f73f9bed0f8106
parent53936f3d571cc5ef36742f468666d04fc995056a (diff)
downloadyoutube-dl-bcd6e4bd07fb924e3de37ed46f21c46debdebaa8.tar.gz
youtube-dl-bcd6e4bd07fb924e3de37ed46f21c46debdebaa8.tar.xz
youtube-dl-bcd6e4bd07fb924e3de37ed46f21c46debdebaa8.zip
YoutubeIE: extract the correct video id for movie URLs (closes #597)
-rw-r--r--youtube_dl/extractor/youtube.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py
index 109c8a93f..656f46f21 100644
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@@ -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=