From 42c7b13f7530246f7429dd83c3522bd9ac3921c4 Mon Sep 17 00:00:00 2001 From: Celthi Date: Thu, 17 Dec 2015 09:27:53 +0800 Subject: [PATCH] [youku] rebase on master and resolve confilcts --- youtube_dl/extractor/youku.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/youtube_dl/extractor/youku.py b/youtube_dl/extractor/youku.py index d09466eba..2e3385349 100644 --- a/youtube_dl/extractor/youku.py +++ b/youtube_dl/extractor/youku.py @@ -245,17 +245,17 @@ class YoukuIE(InfoExtractor): 'formats': [], # some formats are not available for all parts, we have to detect # which one has all - } for i in range(min(seq))] + } for i in range(min(seq))] stream = data['stream'][seq.index(min(seq))] fm = stream.get('stream_type') video_urls = video_urls_dict[fm] for video_url, seg, entry in zip(video_urls, stream['segs'], entries): entry['formats'].append({ - 'url': video_url, - 'format_id': self.get_format_name(fm), - 'ext': self.parse_ext_l(fm), - 'filesize': int(seg['size']), - }) + 'url': video_url, + 'format_id': self.get_format_name(fm), + 'ext': self.parse_ext_l(fm), + 'filesize': int(seg['size']), + }) return { '_type': 'multi_video',