]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[extractor/common] Fix 2.0 manifest extraction (Closes #4830)
authorSergey M․ <dstftw@gmail.com>
Thu, 5 Feb 2015 22:29:29 +0000 (04:29 +0600)
committerSergey M․ <dstftw@gmail.com>
Thu, 5 Feb 2015 22:29:29 +0000 (04:29 +0600)
youtube_dl/extractor/common.py

index 8ec7cee06e81a522c3709f76cd9a5a0dcfdc68c9..df1a4417bb99fe6cf415b293ce068787d1568dc8 100644 (file)
@@ -778,7 +778,8 @@ class InfoExtractor(object):
             media_nodes = manifest.findall('{http://ns.adobe.com/f4m/2.0}media')
         for i, media_el in enumerate(media_nodes):
             if manifest_version == '2.0':
-                manifest_url = '/'.join(manifest_url.split('/')[:-1]) + '/' + media_el.attrib.get('href')
+                manifest_url = ('/'.join(manifest_url.split('/')[:-1]) + '/'
+                                + (media_el.attrib.get('href') or media_el.attrib.get('url')))
             tbr = int_or_none(media_el.attrib.get('bitrate'))
             formats.append({
                 'format_id': '-'.join(filter(None, [f4m_id, 'f4m-%d' % (i if tbr is None else tbr)])),