projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dc519b5
)
[mdr] Fix failed formats processing
author
Sergey M․
<dstftw@gmail.com>
Sat, 31 Oct 2015 18:01:08 +0000
(
00:01
+0600)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 31 Oct 2015 18:01:08 +0000
(
00:01
+0600)
youtube_dl/extractor/mdr.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/mdr.py
b/youtube_dl/extractor/mdr.py
index a566c6a2c333a8c9b7ba62d094cb659f838761ea..88334889e950915304bca35c8c42bf104c143307 100644
(file)
--- a/
youtube_dl/extractor/mdr.py
+++ b/
youtube_dl/extractor/mdr.py
@@
-96,8
+96,6
@@
class MDRIE(InfoExtractor):
vbr = int_or_none(xpath_text(asset, './bitrateVideo', 'vbr'), 1000)
abr = int_or_none(xpath_text(asset, './bitrateAudio', 'abr'), 1000)
vbr = int_or_none(xpath_text(asset, './bitrateVideo', 'vbr'), 1000)
abr = int_or_none(xpath_text(asset, './bitrateAudio', 'abr'), 1000)
- url_formats = []
-
ext = determine_ext(url_el.text)
if ext == 'm3u8':
url_formats = self._extract_m3u8_formats(
ext = determine_ext(url_el.text)
if ext == 'm3u8':
url_formats = self._extract_m3u8_formats(
@@
-130,7
+128,10
@@
class MDRIE(InfoExtractor):
'height': height,
})
'height': height,
})
- url_formats.append(f)
+ url_formats = [f]
+
+ if not url_formats:
+ continue
if not vbr:
for f in url_formats:
if not vbr:
for f in url_formats:
@@
-142,8
+143,8
@@
class MDRIE(InfoExtractor):
'vcodec': 'none',
})
'vcodec': 'none',
})
- if url_formats:
- formats.extend(url_formats)
+ formats.extend(url_formats)
+
self._sort_formats(formats)
description = xpath_text(doc, './broadcast/broadcastDescription', 'description')
self._sort_formats(formats)
description = xpath_text(doc, './broadcast/broadcastDescription', 'description')