X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fmtv.py;h=f6f31bfdc53c6cb0685cfb74e9cc59b56269d77f;hb=4919603f66aac39f81ce90b3beca47db59d9384d;hp=ceb3aa37e65f9fe4b18eabe63c5c3fd483f53d77;hpb=780ee4e501b1234e51c3530a93930962bea42f34;p=youtube-dl.git

diff --git a/youtube_dl/extractor/mtv.py b/youtube_dl/extractor/mtv.py
index ceb3aa37e..f6f31bfdc 100644
--- a/youtube_dl/extractor/mtv.py
+++ b/youtube_dl/extractor/mtv.py
@@ -112,9 +112,12 @@ class MTVServicesInfoExtractor(InfoExtractor):
         title = url_basename(url)
         webpage = self._download_webpage(url, title)
         try:
-            # the url is in the format http://media.mtvnservices.com/fb/{mgid}.swf
-            fb_url = self._og_search_video_url(webpage)
-            mgid = url_basename(fb_url).rpartition('.')[0]
+            # the url can be http://media.mtvnservices.com/fb/{mgid}.swf
+            # or http://media.mtvnservices.com/{mgid}
+            og_url = self._og_search_video_url(webpage)
+            mgid = url_basename(og_url)
+            if mgid.endswith('.swf'):
+                mgid = mgid[:-4]
         except RegexNotFoundError:
             mgid = self._search_regex(r'data-mgid="(.*?)"', webpage, u'mgid')
         return self._get_videos_info(mgid)