From: Sergey M․ <dstftw@gmail.com>
Date: Fri, 28 Aug 2015 15:45:29 +0000 (+0600)
Subject: [mtvservices] Catch more georestriction errors
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=054d43bb11590da234e7e8f46a595a34b19efb8c;p=youtube-dl

[mtvservices] Catch more georestriction errors
---

diff --git a/youtube_dl/extractor/mtv.py b/youtube_dl/extractor/mtv.py
index d160f4a22..4e4358151 100644
--- a/youtube_dl/extractor/mtv.py
+++ b/youtube_dl/extractor/mtv.py
@@ -67,7 +67,7 @@ class MTVServicesInfoExtractor(InfoExtractor):
         return [{'url': url, 'ext': 'mp4'}]
 
     def _extract_video_formats(self, mdoc, mtvn_id):
-        if re.match(r'.*/(error_country_block\.swf|geoblock\.mp4)$', mdoc.find('.//src').text) is not None:
+        if re.match(r'.*/(error_country_block\.swf|geoblock\.mp4|copyright_error\.flv(?:\?geo\b.+?)?)$', mdoc.find('.//src').text) is not None:
             if mtvn_id is not None and self._MOBILE_TEMPLATE is not None:
                 self.to_screen('The normal version is not available from your '
                                'country, trying with the mobile version')