summary refs log tree commit diff
diff options
context:
space:
mode:
authordinesh <dsdiscoverdinesh@gmail.com>2014-10-24 02:41:10 +0530
committerdinesh <dsdiscoverdinesh@gmail.com>2014-10-24 02:41:10 +0530
commit34e48bed3b562ef32c3bfa14ba59101786316464 (patch)
tree588a9a94d365e0158c193b5e6fbc00ed93bd1e46
parent2c63ccec78faec092394d4461cb9428504e8c830 (diff)
downloadyoutube-dl-34e48bed3b562ef32c3bfa14ba59101786316464.tar.gz
youtube-dl-34e48bed3b562ef32c3bfa14ba59101786316464.tar.xz
youtube-dl-34e48bed3b562ef32c3bfa14ba59101786316464.zip
[extractor/common] Added support for f4m manifest Version 2.0
-rw-r--r--youtube_dl/extractor/common.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index e8366f7f9..290df1175 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -648,6 +648,8 @@ class InfoExtractor(object):
 
         formats = []
         media_nodes = manifest.findall('{http://ns.adobe.com/f4m/1.0}media')
+        if not media_nodes:
+            media_nodes = manifest.findall('{http://ns.adobe.com/f4m/2.0}media')
         for i, media_el in enumerate(media_nodes):
             tbr = int_or_none(media_el.attrib.get('bitrate'))
             format_id = 'f4m-%d' % (i if tbr is None else tbr)