youtube-dl

commit 0daa05961b3ba8df7bc81529dfb2231b8b35a441
parent 45c24df51260b35f1e1f702b8488906c4be9f065
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Thu, 11 Dec 2014 16:23:01 +0100

Merge branch 'master' of github.com:rg3/youtube-dl

Diffstat:
M
youtube_dl/extractor/ntv.py
 | 
2
+-
M
youtube_dl/extractor/tvplay.py
 | 
4
++--

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/youtube_dl/extractor/ntv.py b/youtube_dl/extractor/ntv.py
@@ -130,7 +130,7 @@ class NTVIE(InfoExtractor):
                 'rtmp_conn': 'B:1',
                 'player_url': 'http://www.ntv.ru/swf/vps1.swf?update=20131128',
                 'page_url': 'http://www.ntv.ru',
-                'flash_ver': 'LNX 11,2,202,341',
+                'flash_version': 'LNX 11,2,202,341',
                 'rtmp_live': True,
                 'ext': 'flv',
                 'filesize': int(size.text),
diff --git a/youtube_dl/extractor/tvplay.py b/youtube_dl/extractor/tvplay.py
@@ -182,8 +182,8 @@ class TVPlayIE(InfoExtractor):
             'http://playapi.mtgx.tv/v1/videos/%s' % video_id, video_id, 'Downloading video JSON')
 
         if video['is_geo_blocked']:
-            raise ExtractorError(
-                'This content is not available in your country due to copyright reasons', expected=True)
+            self.report_warning(
+                'This content might not be available in your country due to copyright reasons')
 
         streams = self._download_json(
             'http://playapi.mtgx.tv/v1/videos/stream/%s' % video_id, video_id, 'Downloading streams JSON')