aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/common.py
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2016-06-08 00:19:33 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2016-06-08 00:19:33 +0800
commita6571f1073eab6c9a4cc9800a0bff31cf12fe09f (patch)
treed659312f18897554870786b5ef2ab8dd13df6a5b /youtube_dl/extractor/common.py
parent57b6e9652e27aa46395dab6238e54d63746f9a0e (diff)
[common] Fix <bootstrapInfo> detection in F4M manifests
Regression since 0a5685b26fae0940f14cb063a6e4fc6986f9c124
Diffstat (limited to 'youtube_dl/extractor/common.py')
-rw-r--r--youtube_dl/extractor/common.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index 57793537b..bfd432160 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -45,6 +45,7 @@ from ..utils import (
unescapeHTML,
unified_strdate,
url_basename,
+ xpath_element,
xpath_text,
xpath_with_ns,
determine_protocol,
@@ -1030,7 +1031,7 @@ class InfoExtractor(object):
if base_url:
base_url = base_url.strip()
- bootstrap_info = xpath_text(
+ bootstrap_info = xpath_element(
manifest, ['{http://ns.adobe.com/f4m/1.0}bootstrapInfo', '{http://ns.adobe.com/f4m/2.0}bootstrapInfo'],
'bootstrap info', default=None)
@@ -1085,7 +1086,7 @@ class InfoExtractor(object):
formats.append({
'format_id': format_id,
'url': manifest_url,
- 'ext': 'flv' if bootstrap_info else None,
+ 'ext': 'flv' if bootstrap_info is not None else None,
'tbr': tbr,
'width': width,
'height': height,