X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=inline;f=youtube_dl%2Fextractor%2Fmtv.py;h=5447b6c0cab098b895eda0e9f2b3b266fb65a7b0;hb=c9ae7b95659df18a296752f31162e57d29777a80;hp=f6f31bfdc53c6cb0685cfb74e9cc59b56269d77f;hpb=4bbf139aa75cace056989411003e4a1b6b2616e7;p=youtube-dl

diff --git a/youtube_dl/extractor/mtv.py b/youtube_dl/extractor/mtv.py
index f6f31bfdc..5447b6c0c 100644
--- a/youtube_dl/extractor/mtv.py
+++ b/youtube_dl/extractor/mtv.py
@@ -86,6 +86,9 @@ class MTVServicesInfoExtractor(InfoExtractor):
             title_el = itemdoc.find('.//{http://search.yahoo.com/mrss/}title')
         if title_el is None:
             title_el = itemdoc.find('.//title')
+            if title_el.text is None:
+                title_el = None
+
         title = title_el.text
         if title is None:
             raise ExtractorError('Could not find video title')
@@ -119,7 +122,9 @@ class MTVServicesInfoExtractor(InfoExtractor):
             if mgid.endswith('.swf'):
                 mgid = mgid[:-4]
         except RegexNotFoundError:
-            mgid = self._search_regex(r'data-mgid="(.*?)"', webpage, u'mgid')
+            mgid = self._search_regex(
+                [r'data-mgid="(.*?)"', r'swfobject.embedSWF\(".*?(mgid:.*?)"'],
+                webpage, u'mgid')
         return self._get_videos_info(mgid)