[youku] adapt modification to main rep

2015-12-17 10:08:01 +08:00 · 2015-12-17 10:08:01 +08:00 · 2c9089dab7
commit 2c9089dab7
parent d687cf46fa 44651b67ad
1 changed files with 4 additions and 0 deletions
--- a/youtube_dl/extractor/youku.py
+++ b/youtube_dl/extractor/youku.py
@ -87,6 +87,10 @@ class YoukuIE(InfoExtractor):
        # get oip
        oip = data['security']['ip']

+<<<<<<< HEAD
+=======
+        # get fileid
+>>>>>>> githubMaster/youku_bugfix
        fileid_dict = {}
        for stream in data['stream']:
            format = stream.get('stream_type')