From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Sat, 8 Mar 2014 18:43:18 +0000 (+0100)
Subject: [mtv] Improve detection of geoblocked videos
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=cc1db7f9b7aaea745e147153b1acc3013ab6dc72;p=youtube-dl

[mtv] Improve detection of geoblocked videos
---

diff --git a/youtube_dl/extractor/mtv.py b/youtube_dl/extractor/mtv.py
index 5447b6c0c..3a33cc9b6 100644
--- a/youtube_dl/extractor/mtv.py
+++ b/youtube_dl/extractor/mtv.py
@@ -40,8 +40,9 @@ class MTVServicesInfoExtractor(InfoExtractor):
             return thumb_node.attrib['url']
 
     def _extract_video_formats(self, mdoc):
-        if re.match(r'.*/error_country_block\.swf$', mdoc.find('.//src').text) is not None:
-            raise ExtractorError('This video is not available from your country.', expected=True)
+        if re.match(r'.*/(error_country_block\.swf|geoblock\.mp4)$', mdoc.find('.//src').text) is not None:
+            raise ExtractorError('This video is not available from your country.',
+                expected=True)
 
         formats = []
         for rendition in mdoc.findall('.//rendition'):