minhngoc25a
/
yt-dlc
mirror of https://github.com/blackjack4494/yt-dlc
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:thesues/youtube-dl 

Conflicts:
	youtube-dl
	youtube_dl/InfoExtractors.py
This commit is contained in:
dongmao zhang 2012-08-10 18:32:28 +08:00
parent b5809a68bf 51661d8600
commit 392105265c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
youtube_dl/InfoExtractors.py
View File

@ -3019,7 +3019,10 @@ class YoukuIE(InfoExtractor):
video_id = mobj.group('ID') video_id = mobj.group('ID')
info_url = 'http://v.youku.com/player/getPlayList/VideoIDS/' + video_id info_url = 'http://v.youku.com/player/getPlayList/VideoIDS/' + video_id
<<<<<<< HEAD
print info_url print info_url
=======
>>>>>>> 51661d86005ffbdd4debd051cd9683cf5f5c2fe9
request = urllib2.Request(info_url, None, std_headers) request = urllib2.Request(info_url, None, std_headers)
try: try:
@ -3088,4 +3091,3 @@ class YoukuIE(InfoExtractor):
files_info.append(info) files_info.append(info)
return files_info return files_info
# vim: tabstop=4 shiftwidth=4 softtabstop=4 noexpandtab