X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fliveleak.py;h=4684994e1726fc1785de3b8df6061f2eaf278ed8;hb=2812c24c167dfaeed62737f2b5ba2a5c7c0de97f;hp=e82f21ea7136b1e4a0ef797c20d120a65b49a0a7;hpb=00ac23e6e06bf6de59d5d5b3f42ff64ce039fee2;p=youtube-dl diff --git a/youtube_dl/extractor/liveleak.py b/youtube_dl/extractor/liveleak.py index e82f21ea7..4684994e1 100644 --- a/youtube_dl/extractor/liveleak.py +++ b/youtube_dl/extractor/liveleak.py @@ -41,12 +41,13 @@ 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': { 'id': '801_1409392012', 'ext': 'mp4', - 'description': "Happened on 27.7.2014. \r\nAt 0:53 you can see people still swimming at near beach.", + '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' } @@ -95,6 +96,9 @@ class LiveLeakIE(InfoExtractor): 'url': s['file'], } for i, s in enumerate(sources)] for i, s in enumerate(sources): + # 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({