projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ir90tv' of https://github.com/cyb3r/youtube-dl into cyb3r-ir90tv
[youtube-dl]
/
youtube_dl
/
extractor
/
niconico.py
diff --git
a/youtube_dl/extractor/niconico.py
b/youtube_dl/extractor/niconico.py
index 3cecebf95a4acd0a388da5984aebc2822e79b32c..0f8aa5adad5b2247621ce00249f3bd03a33a104a 100644
(file)
--- a/
youtube_dl/extractor/niconico.py
+++ b/
youtube_dl/extractor/niconico.py
@@
-182,7
+182,6
@@
class NiconicoIE(InfoExtractor):
extension = xpath_text(video_info, './/movie_type')
if not extension:
extension = determine_ext(video_real_url)
extension = xpath_text(video_info, './/movie_type')
if not extension:
extension = determine_ext(video_real_url)
- video_format = extension.upper()
thumbnail = (
xpath_text(video_info, './/thumbnail_url') or
thumbnail = (
xpath_text(video_info, './/thumbnail_url') or
@@
-241,7
+240,7
@@
class NiconicoIE(InfoExtractor):
'url': video_real_url,
'title': title,
'ext': extension,
'url': video_real_url,
'title': title,
'ext': extension,
- 'format
': video_format
,
+ 'format
_id': 'economy' if video_real_url.endswith('low') else 'normal'
,
'thumbnail': thumbnail,
'description': description,
'uploader': uploader,
'thumbnail': thumbnail,
'description': description,
'uploader': uploader,