From: dongmao zhang Date: Fri, 10 Aug 2012 10:32:28 +0000 (+0800) Subject: Merge branch 'master' of github.com:thesues/youtube-dl X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=392105265ccb3e155fe92b3c0ac15b2b4ff906d3;p=youtube-dl Merge branch 'master' of github.com:thesues/youtube-dl Conflicts: youtube-dl youtube_dl/InfoExtractors.py --- 392105265ccb3e155fe92b3c0ac15b2b4ff906d3 diff --cc youtube_dl/InfoExtractors.py index da2294a6b,869f5202c..7221ae41e --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@@ -3019,7 -3019,6 +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: