projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
b5809a6
)
Merge branch 'master' of github.com:thesues/youtube-dl
author
dongmao zhang
<deanraccoon@gmail.com>
Fri, 10 Aug 2012 10:32:28 +0000
(18:32 +0800)
committer
dongmao zhang
<deanraccoon@gmail.com>
Fri, 10 Aug 2012 10:32:28 +0000
(18:32 +0800)
Conflicts:
youtube-dl
youtube_dl/InfoExtractors.py
youtube_dl/InfoExtractors.py
patch
|
blob
|
history
diff --git
a/youtube_dl/InfoExtractors.py
b/youtube_dl/InfoExtractors.py
index da2294a6b89b8e93bb1511babbdc282f2b46969e..7221ae41e4796adc0830b4ae789556ec3d1e7d26 100644
(file)
--- 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