X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fliveleak.py;h=857edfde263196d9bf2811568cc9f9de90eed92b;hb=eedd20ef9637660d5585b1b7d221d7f2d31630ac;hp=c658cc92bdd505badc8ba579afd2743fad941746;hpb=7d0c934a3ef1b0c6d3dff91aaa685c1cd71e5580;p=youtube-dl diff --git a/youtube_dl/extractor/liveleak.py b/youtube_dl/extractor/liveleak.py index c658cc92b..857edfde2 100644 --- a/youtube_dl/extractor/liveleak.py +++ b/youtube_dl/extractor/liveleak.py @@ -41,6 +41,7 @@ class LiveLeakIE(InfoExtractor): 'age_limit': 18, } }, { + # Covers https://github.com/rg3/youtube-dl/pull/5983 'url': 'http://www.liveleak.com/view?i=801_1409392012', 'md5': '0b3bec2d888c20728ca2ad3642f0ef15', 'info_dict': { @@ -95,7 +96,10 @@ class LiveLeakIE(InfoExtractor): 'url': s['file'], } for i, s in enumerate(sources)] for i, s in enumerate(sources): - orig_url = re.sub(r'.h264_.+\.mp4', '', s['file']) + # Removing '.h264_*.mp4' gives the raw video, which is essentially + # the same video without the LiveLeak logo at the top (see + # https://github.com/rg3/youtube-dl/pull/4768) + orig_url = re.sub(r'\.h264_.+?\.mp4', '', s['file']) if s['file'] != orig_url: formats.append({ 'format_id': 'original-%s' % i,