summary refs log tree commit diff
diff options
context:
space:
mode:
authorAntti Ajanki <antti.ajanki@iki.fi>2015-02-22 10:18:36 +0200
committerAntti Ajanki <antti.ajanki@iki.fi>2015-02-24 21:22:59 +0200
commit6f4ba54079893a09c6aa78fe3420523fb96df858 (patch)
tree5a84d8bbbfa6c98921786a6166f66f7d961449cd
parent637570326bfa12575fe210e52e2a39d6585891d8 (diff)
downloadyoutube-dl-6f4ba54079893a09c6aa78fe3420523fb96df858.tar.gz
youtube-dl-6f4ba54079893a09c6aa78fe3420523fb96df858.tar.xz
youtube-dl-6f4ba54079893a09c6aa78fe3420523fb96df858.zip
[extractor/common] Extract HTTP (possibly f4m) URLs from a .smil file
-rw-r--r--youtube_dl/extractor/common.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index 4fe99d25d..313688208 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -963,6 +963,14 @@ class InfoExtractor(object):
                 'width': width,
                 'height': height,
             }], rtmp_count)
+        elif proto.startswith('http'):
+            return ([{
+                'url': base + src,
+                'ext': ext or 'flv',
+                'tbr': bitrate,
+                'width': width,
+                'height': height,
+            }], rtmp_count)
 
     def _live_title(self, name):
         """ Generate the title for a live video """