From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 23 Dec 2013 14:57:43 +0000 (+0100)
Subject: [myvideo] Use RTMP instead of RTMPT (Fixes #2032)
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=f45f96f8f83b7004960a269fea8bfab40a14c725;hp=1538eff6d8ee73f2ae4ac1dd832a9ef978c63074;p=youtube-dl

[myvideo] Use RTMP instead of RTMPT (Fixes #2032)
---

diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index 9d39c632a..0dd504444 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -242,6 +242,11 @@ class InfoExtractor(object):
             xml_string = transform_source(xml_string)
         return xml.etree.ElementTree.fromstring(xml_string.encode('utf-8'))
 
+    def report_warning(self, msg, video_id=None):
+        idstr = u'' if video_id is None else u'%s: ' % video_id
+        self._downloader.report_warning(
+            u'[%s] %s%s' % (self.IE_NAME, idstr, msg))
+
     def to_screen(self, msg):
         """Print msg to screen, prefixing it with '[ie_name]'"""
         self._downloader.to_screen(u'[%s] %s' % (self.IE_NAME, msg))
diff --git a/youtube_dl/extractor/myvideo.py b/youtube_dl/extractor/myvideo.py
index 0404e6e43..6d35c7861 100644
--- a/youtube_dl/extractor/myvideo.py
+++ b/youtube_dl/extractor/myvideo.py
@@ -143,8 +143,10 @@ class MyVideoIE(InfoExtractor):
         if mobj:
             video_url = compat_urllib_parse.unquote(mobj.group(1))
             if 'myvideo2flash' in video_url:
-                self._downloader.report_warning(u'forcing RTMPT ...')
-                video_url = video_url.replace('rtmpe://', 'rtmpt://')
+                self.report_warning(
+                    u'Rewriting URL to use unencrypted rtmp:// ...',
+                    video_id)
+                video_url = video_url.replace('rtmpe://', 'rtmp://')
 
         if not video_url:
             # extract non rtmp videos