diff options
| author | Rogério Brito <rbrito@ime.usp.br> | 2011-08-04 17:44:33 -0300 |
|---|---|---|
| committer | Rogério Brito <rbrito@ime.usp.br> | 2011-08-04 17:44:33 -0300 |
| commit | 05b4029662d3ed2c778dffc24bf33f27434c2ce1 (patch) | |
| tree | 71e0d98d8a2aba612d88f2c98f7b1cda621fe213 | |
| parent | 43c0a396a2f9f16ec821cd9c5231a31b4b410589 (diff) | |
| parent | 33d507f1fe828b186dec9b61ff4fc6b5fdcf42b2 (diff) | |
| download | youtube-dl-05b4029662d3ed2c778dffc24bf33f27434c2ce1.tar.gz youtube-dl-05b4029662d3ed2c778dffc24bf33f27434c2ce1.tar.xz youtube-dl-05b4029662d3ed2c778dffc24bf33f27434c2ce1.zip | |
Merge https://github.com/rg3/youtube-dl into prefer-webm
| -rw-r--r-- | LATEST_VERSION | 2 | ||||
| -rwxr-xr-x | youtube-dl | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/LATEST_VERSION b/LATEST_VERSION index 295c9c4fa..8a3bb049a 100644 --- a/LATEST_VERSION +++ b/LATEST_VERSION @@ -1 +1 @@ -2011.03.29 +2011.08.04 diff --git a/youtube-dl b/youtube-dl index 5f275c3cb..569c58e4a 100755 --- 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', ) |