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

[youku] adapt my modification to main repo

Browse Source
This commit is contained in:
Celthi 2015-12-17 10:25:32 +08:00
parent 2c9089dab7
commit 1d189d15c5
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
youtube_dl/extractor/youku.py
View File

@ -87,10 +87,6 @@ class YoukuIE(InfoExtractor):
# get oip # get oip
oip = data['security']['ip'] oip = data['security']['ip']
<<<<<<< HEAD
=======
# get fileid
>>>>>>> githubMaster/youku_bugfix
fileid_dict = {} fileid_dict = {}
for stream in data['stream']: for stream in data['stream']:
format = stream.get('stream_type') format = stream.get('stream_type')