From: dinesh <dsdiscoverdinesh@gmail.com>
Date: Thu, 23 Oct 2014 21:11:10 +0000 (+0530)
Subject: [extractor/common] Added support for f4m manifest Version 2.0
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=34e48bed3b562ef32c3bfa14ba59101786316464;p=youtube-dl

[extractor/common] Added support for f4m manifest Version 2.0
---

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)