[youtube-dl] Update to latest release to adjust to backend changes (Red Hat Bug #728378)

[Till Maas]

commit a9d5b625451fb36ba2b38b8b640db548625afc05
Author: Till Maas <opensource at till.name>
Date:   Thu Aug 4 23:29:39 2011 +0200

    Update to latest release to adjust to backend changes (Red Hat Bug
    #728378)

 youtube-dl      |   10 ++++++----
 youtube-dl.spec |    6 +++++-
 2 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/youtube-dl b/youtube-dl
old mode 100644
new mode 100755
index 3ac27a8..e8b19c8
--- a/youtube-dl
+++ b/youtube-dl
@@ -38,7 +38,7 @@ except ImportError:
 	from cgi import parse_qs
 
 std_headers = {
-	'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:2.0b11) Gecko/20100101 Firefox/4.0b11',
+	'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:5.0.1) Gecko/20100101 Firefox/5.0.1',
 	'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
 	'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
 	'Accept-Encoding': 'gzip, deflate',
@@ -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):]
@@ -2723,7 +2725,7 @@ if __name__ == '__main__':
 		# Parse command line
 		parser = optparse.OptionParser(
 			usage='Usage: %prog [options] url...',
-			version='2011.03.29',
+			version='2011.08.04',
 			conflict_handler='resolve',
 		)
 
diff --git a/youtube-dl.spec b/youtube-dl.spec
index c2f7782..9c0aa97 100644
--- a/youtube-dl.spec
+++ b/youtube-dl.spec
@@ -1,5 +1,5 @@
 Name:           youtube-dl
-Version:        2011.03.29
+Version:        2011.08.04
 Release:        1%{?dist}
 Summary:        Small command-line program to download videos from YouTube
 Summary(pl):    Tekstowy program do pobierania filmów z youtube.com
@@ -37,6 +37,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{name}
 
 %changelog
+* Thu Aug 04 2011 Till Maas <opensource at till.name> - 2011.08.04-1
+- Update to latest release to adjust to backend changes (Red Hat Bug
+  #728378)
+
 * Fri May 13 2011 Till Maas <opensource at till.name> - 2011.03.29-1
 - Update to latest release