aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2014-03-08 19:43:18 +0100
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2014-03-08 19:46:34 +0100
commitcc1db7f9b7aaea745e147153b1acc3013ab6dc72 (patch)
tree9cab46cb2055c08010daa0e1e26adca391873061
parent1060425cbb4beffc2a36aa361b03db60df0e40f8 (diff)
downloadyoutube-dl-cc1db7f9b7aaea745e147153b1acc3013ab6dc72.tar.xz
[mtv] Improve detection of geoblocked videos
-rw-r--r--youtube_dl/extractor/mtv.py5
1 files changed, 3 insertions, 2 deletions
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'):