From: Jaime Marquínez Ferrándiz Date: Mon, 1 Jul 2013 14:51:18 +0000 (+0200) Subject: YoutubeIE: extract the correct video id for movie URLs (closes #597) X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=bcd6e4bd07fb924e3de37ed46f21c46debdebaa8;p=youtube-dl YoutubeIE: extract the correct video id for movie URLs (closes #597) --- 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=