projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'dstftw/correct-valid-urls'
[youtube-dl]
/
youtube_dl
/
extractor
/
viddler.py
diff --git
a/youtube_dl/extractor/viddler.py
b/youtube_dl/extractor/viddler.py
index 36d1bde08eff877e17958388f919d403cdd7a368..138a35b2a05006255fdceb8b8be90fa9a0f6ee4d 100644
(file)
--- a/
youtube_dl/extractor/viddler.py
+++ b/
youtube_dl/extractor/viddler.py
@@
-47,7
+47,7
@@
class ViddlerIE(InfoExtractor):
r"thumbnail\s*:\s*'([^']*)'",
webpage, u'thumbnail', fatal=False)
r"thumbnail\s*:\s*'([^']*)'",
webpage, u'thumbnail', fatal=False)
-
info =
{
+
return
{
'_type': 'video',
'id': video_id,
'title': title,
'_type': 'video',
'id': video_id,
'title': title,
@@
-56,9
+56,3
@@
class ViddlerIE(InfoExtractor):
'duration': duration,
'formats': formats,
}
'duration': duration,
'formats': formats,
}
-
- # TODO: Remove when #980 has been merged
- info['formats'][-1]['ext'] = determine_ext(info['formats'][-1]['url'])
- info.update(info['formats'][-1])
-
- return info