summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorPhilipp Hagemeister <[email protected]>2014-08-25 13:03:08 +0200
committerPhilipp Hagemeister <[email protected]>2014-08-25 13:03:08 +0200
commitb252735910a20ccbcf327a778ac014d674a44428 (patch)
treeb1d186c03d5aab1c1769deccdae75f7c3190fcda
parent7adcbe759419320bf6224247640e2cc9f058fa8a (diff)
downloadyoutube-dl-b252735910a20ccbcf327a778ac014d674a44428.tar.gz
youtube-dl-b252735910a20ccbcf327a778ac014d674a44428.zip
[extractor/common] Generate better f4m format IDs
-rw-r--r--youtube_dl/extractor/common.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index 4d5b48167..69d5f687c 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -620,11 +620,15 @@ class InfoExtractor(object):
'Unable to download f4m manifest')
formats = []
- for media_el in manifest.findall('{http://ns.adobe.com/f4m/1.0}media'):
+ media_nodes = manifest.findall('{http://ns.adobe.com/f4m/1.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)
formats.append({
+ 'format_id': format_id,
'url': manifest_url,
'ext': 'flv',
- 'tbr': int_or_none(media_el.attrib.get('bitrate')),
+ 'tbr': tbr,
'width': int_or_none(media_el.attrib.get('width')),
'height': int_or_none(media_el.attrib.get('height')),
})