diff options
| author | dongmao zhang <deanraccoon@gmail.com> | 2012-08-10 18:32:28 +0800 |
|---|---|---|
| committer | dongmao zhang <deanraccoon@gmail.com> | 2012-08-10 18:32:28 +0800 |
| commit | 392105265ccb3e155fe92b3c0ac15b2b4ff906d3 (patch) | |
| tree | f2e3c93ce007602fa1d8d5d9432d5eec4f25ffb1 | |
| parent | b5809a68bf94e5aa1172e5415be8d7fb91877de8 (diff) | |
| parent | 51661d86005ffbdd4debd051cd9683cf5f5c2fe9 (diff) | |
Merge branch 'master' of github.com:thesues/youtube-dl
Conflicts:
youtube-dl
youtube_dl/InfoExtractors.py
| -rw-r--r-- | youtube_dl/InfoExtractors.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index da2294a6b..7221ae41e 100644 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -3019,7 +3019,10 @@ class YoukuIE(InfoExtractor): video_id = mobj.group('ID') info_url = 'http://v.youku.com/player/getPlayList/VideoIDS/' + video_id +<<<<<<< HEAD print info_url +======= +>>>>>>> 51661d86005ffbdd4debd051cd9683cf5f5c2fe9 request = urllib2.Request(info_url, None, std_headers) try: @@ -3088,4 +3091,3 @@ class YoukuIE(InfoExtractor): files_info.append(info) return files_info -# vim: tabstop=4 shiftwidth=4 softtabstop=4 noexpandtab |