From: Ricardo Garcia <commits@rg3.name>
Date: Thu, 4 Aug 2011 17:13:02 +0000 (+0200)
Subject: Fix YouTube downloads (code by Philipp Hagemeister)
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=8126094cf14dd35c00b59a0435ac34fc0ee9ef57;p=youtube-dl

Fix YouTube downloads (code by Philipp Hagemeister)
---

diff --git a/youtube-dl b/youtube-dl
index 3ac27a857..d9307216b 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -1079,8 +1079,10 @@ class YoutubeIE(InfoExtractor):
 		# Decide which formats to download
 		req_format = self._downloader.params.get('format', None)
 
-		if 'fmt_url_map' in video_info and len(video_info['fmt_url_map']) >= 1 and ',' in video_info['fmt_url_map'][0]:
-			url_map = dict(tuple(pair.split('|')) for pair in video_info['fmt_url_map'][0].split(','))
+		if 'url_encoded_fmt_stream_map' in video_info and len(video_info['url_encoded_fmt_stream_map']) >= 1:
+			url_data_strs = video_info['url_encoded_fmt_stream_map'][0].split(',')
+			url_data = [dict(pairStr.split('=') for pairStr in uds.split('&')) for uds in url_data_strs]
+			url_map = dict((ud['itag'], urllib.unquote(ud['url'])) for ud in url_data)
 			format_limit = self._downloader.params.get('format_limit', None)
 			if format_limit is not None and format_limit in self._available_formats:
 				format_list = self._available_formats[self._available_formats.index(format_limit):]