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

2015-12-27 15:03:13 +01:00 · 2015-12-27 15:03:13 +01:00 · 2db772b9ea
parent 7b81316508 05358deeca
commit 2db772b9ea
1 changed files with 4 additions and 2 deletions
--- a/youtube_dl/extractor/sportdeutschland.py
+++ b/youtube_dl/extractor/sportdeutschland.py
@ -70,10 +70,12 @@ class SportDeutschlandIE(InfoExtractor):

            smil_doc = self._download_xml(
                smil_url, video_id, note='Downloading SMIL metadata')
-            base_url = smil_doc.find('./head/meta').attrib['base']
+            base_url_el = smil_doc.find('./head/meta')
+            if base_url_el:
+                base_url = base_url_el.attrib['base']
            formats.extend([{
                'format_id': 'rmtp',
-                'url': base_url,
+                'url': base_url if base_url_el else n.attrib['src'],
                'play_path': n.attrib['src'],
                'ext': 'flv',
                'preference': -100,