Merge remote-tracking branch 'FiloSottille/supports'

Conflicts:
	youtube-dl

diff --git a/LATEST_VERSION b/LATEST_VERSION
index 0c8dc502a85f6eb25152a8cea3b079a911389f24..88c5427e0ad9ce2824cc13d1e2c96f354fd8687a 100644 (file)
--- a/LATEST_VERSION
+++ b/LATEST_VERSION
@@ -1 +1 @@
-2012.02.27
+2012.09.27

diff --git a/youtube-dl b/youtube-dl
index a7c5ee6f942b4b0770c17fccfa333fdd487a2ed7..21e604a2581626249f25e4e7bf476d7976b54b06 100755 (executable)
Binary files a/youtube-dl and b/youtube-dl differ

diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index 6c4a1b1f1f4445a25e192c9a94cb5024fd2603e5..ff5c47726db5c1f4d1bfb3492c747b2bb2481382 100644 (file)
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -404,7 +404,7 @@ class YoutubeIE(InfoExtractor):
                        url_data_strs = video_info['url_encoded_fmt_stream_map'][0].split(',')
                        url_data = [parse_qs(uds) for uds in url_data_strs]
                        url_data = filter(lambda ud: 'itag' in ud and 'url' in ud, url_data)
-                       url_map = dict((ud['itag'][0], ud['url'][0]) for ud in url_data)
+                       url_map = dict((ud['itag'][0], ud['url'][0] + '&signature=' + ud['sig'][0]) for ud in url_data)
 
                        format_limit = self._downloader.params.get('format_limit', None)
                        available_formats = self._available_formats_prefer_free if self._downloader.params.get('prefer_free_formats', False) else self._available_formats
@@ -3143,4 +3143,4 @@ class XNXXIE(InfoExtractor):
                                'description': None,
                                'player_url': None}
 
-               return [info]
\ No newline at end of file
+               return [info]

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index f49f126720dea7096a474d5e22712e750f65523c..5ed453bf732650f4169bc189ca8c7a1aa291eb7d 100644 (file)
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -19,7 +19,7 @@ __authors__  = (
        )
 
 __license__ = 'Public Domain'
-__version__ = '2012.02.27'
+__version__ = '2012.09.27'
 
 UPDATE_URL = 'https://raw.github.com/rg3/youtube-dl/master/youtube-dl'
 UPDATE_URL_VERSION = 'https://raw.github.com/rg3/youtube-dl/master/LATEST_VERSION'