Merge pull request #5983 from jomo/master

LiveLeak: support more original videos
This commit is contained in:
Sergey M. 2015-06-15 01:49:41 +05:00
commit 7d0c934a3e

View File

@ -40,6 +40,16 @@ class LiveLeakIE(InfoExtractor):
'title': 'Man is Fatally Struck by Reckless Car While Packing up a Moving Truck', 'title': 'Man is Fatally Struck by Reckless Car While Packing up a Moving Truck',
'age_limit': 18, 'age_limit': 18,
} }
}, {
'url': 'http://www.liveleak.com/view?i=801_1409392012',
'md5': '0b3bec2d888c20728ca2ad3642f0ef15',
'info_dict': {
'id': '801_1409392012',
'ext': 'mp4',
'description': "Happened on 27.7.2014. \r\nAt 0:53 you can see people still swimming at near beach.",
'uploader': 'bony333',
'title': 'Crazy Hungarian tourist films close call waterspout in Croatia'
}
}] }]
def _real_extract(self, url): def _real_extract(self, url):
@ -85,7 +95,7 @@ def _real_extract(self, url):
'url': s['file'], 'url': s['file'],
} for i, s in enumerate(sources)] } for i, s in enumerate(sources)]
for i, s in enumerate(sources): for i, s in enumerate(sources):
orig_url = s['file'].replace('.h264_base.mp4', '') orig_url = re.sub(r'.h264_.+\.mp4', '', s['file'])
if s['file'] != orig_url: if s['file'] != orig_url:
formats.append({ formats.append({
'format_id': 'original-%s' % i, 'format_id': 'original-%s' % i,