From: Philipp Hagemeister Date: Thu, 27 Sep 2012 17:24:41 +0000 (+0200) Subject: Merge remote-tracking branch 'FiloSottille/supports' X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=7f36e396768722319b4036b845cd9a105b60bd5b;hp=795cc5059a6f349f861e246269d6cced39b3a753;p=youtube-dl Merge remote-tracking branch 'FiloSottille/supports' Conflicts: youtube-dl --- diff --git a/LATEST_VERSION b/LATEST_VERSION index 0c8dc502a..88c5427e0 100644 --- a/LATEST_VERSION +++ b/LATEST_VERSION @@ -1 +1 @@ -2012.02.27 +2012.09.27 diff --git a/youtube-dl b/youtube-dl index a7c5ee6f9..21e604a25 100755 Binary files a/youtube-dl and b/youtube-dl differ diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index 6c4a1b1f1..ff5c47726 100644 --- 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 f49f12672..5ed453bf7 100644 --- 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'