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

This commit is contained in:
remitamine 2015-12-27 15:03:13 +01:00
commit 2db772b9ea

View File

@ -70,10 +70,12 @@ def _real_extract(self, url):
smil_doc = self._download_xml( smil_doc = self._download_xml(
smil_url, video_id, note='Downloading SMIL metadata') 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([{ formats.extend([{
'format_id': 'rmtp', 'format_id': 'rmtp',
'url': base_url, 'url': base_url if base_url_el else n.attrib['src'],
'play_path': n.attrib['src'], 'play_path': n.attrib['src'],
'ext': 'flv', 'ext': 'flv',
'preference': -100, 'preference': -100,