mirror of
https://github.com/blackjack4494/yt-dlc.git
synced 2024-12-23 08:17:00 +00:00
Merge branch 'master' of github.com:thesues/youtube-dl
Conflicts: youtube-dl youtube_dl/InfoExtractors.py
This commit is contained in:
commit
392105265c
1 changed files with 3 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue