Remove --best-quality option and add proper support for high definition format

This commit is contained in:
Ricardo Garcia 2009-03-28 10:26:41 +01:00
parent 053e77d6ed
commit 79e75f66c8
1 changed files with 7 additions and 3 deletions

View File

@ -543,7 +543,11 @@ class YoutubeIE(InfoExtractor):
format_param = params.get('format', None) format_param = params.get('format', None)
# Extension # Extension
video_extension = {'18': 'mp4', '17': '3gp'}.get(format_param, 'flv') video_extension = {
'17': '3gp',
'18': 'mp4',
'22': 'mp4',
}.get(format_param, 'flv')
# Normalize URL, including format # Normalize URL, including format
normalized_url = 'http://www.youtube.com/watch?v=%s&gl=US&hl=en' % video_id normalized_url = 'http://www.youtube.com/watch?v=%s&gl=US&hl=en' % video_id
@ -960,10 +964,10 @@ if __name__ == '__main__':
action='store_true', dest='gettitle', help='simulate, quiet but print title', default=False) action='store_true', dest='gettitle', help='simulate, quiet but print title', default=False)
parser.add_option('-f', '--format', parser.add_option('-f', '--format',
dest='format', metavar='FMT', help='video format code') dest='format', metavar='FMT', help='video format code')
parser.add_option('-b', '--best-quality',
action='store_const', dest='format', help='alias for -f 18', const='18')
parser.add_option('-m', '--mobile-version', parser.add_option('-m', '--mobile-version',
action='store_const', dest='format', help='alias for -f 17', const='17') action='store_const', dest='format', help='alias for -f 17', const='17')
parser.add_option('-d', '--high-def',
action='store_const', dest='format', help='alias for -f 22', const='22')
parser.add_option('-i', '--ignore-errors', parser.add_option('-i', '--ignore-errors',
action='store_true', dest='ignoreerrors', help='continue on download errors', default=False) action='store_true', dest='ignoreerrors', help='continue on download errors', default=False)
parser.add_option('-r', '--rate-limit', parser.add_option('-r', '--rate-limit',