R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[youku] rebase on master and resolve confilcts

Browse Source
This commit is contained in:
Celthi 2015-12-17 09:27:53 +08:00
parent b5d2c22d87
commit 42c7b13f75
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
youtube_dl/extractor/youku.py
View File

@ -245,17 +245,17 @@ class YoukuIE(InfoExtractor):
'formats': [], 'formats': [],
# some formats are not available for all parts, we have to detect # some formats are not available for all parts, we have to detect
# which one has all # which one has all
} for i in range(min(seq))] } for i in range(min(seq))]
stream = data['stream'][seq.index(min(seq))] stream = data['stream'][seq.index(min(seq))]
fm = stream.get('stream_type') fm = stream.get('stream_type')
video_urls = video_urls_dict[fm] video_urls = video_urls_dict[fm]
for video_url, seg, entry in zip(video_urls, stream['segs'], entries): for video_url, seg, entry in zip(video_urls, stream['segs'], entries):
entry['formats'].append({ entry['formats'].append({
'url': video_url, 'url': video_url,
'format_id': self.get_format_name(fm), 'format_id': self.get_format_name(fm),
'ext': self.parse_ext_l(fm), 'ext': self.parse_ext_l(fm),
'filesize': int(seg['size']), 'filesize': int(seg['size']),
}) })
return { return {
'_type': 'multi_video', '_type': 'multi_video',