projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
57b6e96
)
[common] Fix <bootstrapInfo> detection in F4M manifests
author
Yen Chi Hsuan
<yan12125@gmail.com>
Tue, 7 Jun 2016 16:19:33 +0000
(
00:19
+0800)
committer
Yen Chi Hsuan
<yan12125@gmail.com>
Tue, 7 Jun 2016 16:19:33 +0000
(
00:19
+0800)
Regression since
0a5685b26fae0940f14cb063a6e4fc6986f9c124
youtube_dl/extractor/common.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index 57793537b07573e691c8d664f0a06f95d99a5fde..bfd4321605a906862987063b243703445136dc5e 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-45,6
+45,7
@@
from ..utils import (
unescapeHTML,
unified_strdate,
url_basename,
unescapeHTML,
unified_strdate,
url_basename,
+ xpath_element,
xpath_text,
xpath_with_ns,
determine_protocol,
xpath_text,
xpath_with_ns,
determine_protocol,
@@
-1030,7
+1031,7
@@
class InfoExtractor(object):
if base_url:
base_url = base_url.strip()
if base_url:
base_url = base_url.strip()
- bootstrap_info = xpath_
tex
t(
+ bootstrap_info = xpath_
elemen
t(
manifest, ['{http://ns.adobe.com/f4m/1.0}bootstrapInfo', '{http://ns.adobe.com/f4m/2.0}bootstrapInfo'],
'bootstrap info', default=None)
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,
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,
'tbr': tbr,
'width': width,
'height': height,