summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-01-09 02:38:50 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-01-09 02:38:50 +0100
commitce6b9a2dba1de2f5338917b80ba7073c591fe402 (patch)
treeb5c8db337045dc819356bd4de37729142b3279b9
parentc3197e3e5c245dd56020f3ff38c89d71677c5fc5 (diff)
downloadyoutube-dl-ce6b9a2dba1de2f5338917b80ba7073c591fe402.tar.gz
youtube-dl-ce6b9a2dba1de2f5338917b80ba7073c591fe402.tar.xz
youtube-dl-ce6b9a2dba1de2f5338917b80ba7073c591fe402.zip
[youtube] Add a pseudo format for rtmp videos (#2123)
-rw-r--r--youtube_dl/extractor/youtube.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py
index 70b8decf4..28c88ffc7 100644
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@@ -213,6 +213,9 @@ class YoutubeIE(YoutubeBaseInfoExtractor, SubtitlesInfoExtractor):
         # Dash webm audio
         '171': {'ext': 'webm', 'vcodec': 'none', 'format_note': 'DASH webm audio', 'abr': 48, 'preference': -50},
         '172': {'ext': 'webm', 'vcodec': 'none', 'format_note': 'DASH webm audio', 'abr': 256, 'preference': -50},
+
+        # RTMP (unnamed)
+        '_rtmp': {'protocol': 'rtmp'},
     }
 
     IE_NAME = u'youtube'
@@ -1273,7 +1276,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor, SubtitlesInfoExtractor):
 
         if 'conn' in video_info and video_info['conn'][0].startswith('rtmp'):
             self.report_rtmp_download()
-            video_url_list = [(None, video_info['conn'][0])]
+            video_url_list = [('_rtmp', video_info['conn'][0])]
         elif len(video_info.get('url_encoded_fmt_stream_map', [])) >= 1 or len(video_info.get('adaptive_fmts', [])) >= 1:
             encoded_url_map = video_info.get('url_encoded_fmt_stream_map', [''])[0] + ',' + video_info.get('adaptive_fmts',[''])[0]
             if 'rtmpe%3Dyes' in encoded_url_map: