From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 24 Sep 2013 19:40:30 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=f426de84606fd0807a5ab38c0733032d790b056e;hp=695dc094ab16a0df40712bf504bc2880c62e598f;p=youtube-dl.git

Merge remote-tracking branch 'origin/master'
---

diff --git a/youtube_dl/extractor/southparkstudios.py b/youtube_dl/extractor/southparkstudios.py
index 1a611d3bb..b1e96b679 100644
--- a/youtube_dl/extractor/southparkstudios.py
+++ b/youtube_dl/extractor/southparkstudios.py
@@ -14,7 +14,7 @@ class SouthParkStudiosIE(MTVIE):
         u'file': u'a7bff6c2-ed00-11e0-aca6-0026b9414f30.mp4',
         u'info_dict': {
             u'title': u'Bat Daded',
-            u'description': u'Randy finally gets the chance to fight Bat Dad and gets the boys disqualified from the season championships.',
+            u'description': u'Randy disqualifies South Park by getting into a fight with Bat Dad.',
         },
     }
 
@@ -33,6 +33,6 @@ class SouthParkStudiosIE(MTVIE):
         mobj = re.match(self._VALID_URL, url)
         video_id = mobj.group('id')
         webpage = self._download_webpage(url, video_id)
-        mgid = self._search_regex(r'data-mgid="(mgid:.*?)"',
+        mgid = self._search_regex(r'swfobject.embedSWF\(".*?(mgid:.*?)"',
                                   webpage, u'mgid')
         return self._get_videos_info(mgid)