diff options
| author | Ricardo Garcia <sarbalap+freshmeat@gmail.com> | 2009-05-25 21:02:59 +0200 |
|---|---|---|
| committer | Ricardo Garcia <sarbalap+freshmeat@gmail.com> | 2010-10-31 11:24:32 +0100 |
| commit | 320becd6920421b07326c245a06b996adc2b4397 (patch) | |
| tree | 1fcb72e9fb147b2f731ef2fd83918079e25d2af0 | |
| parent | 968aa884385ba78dc113a64b3dbbb1c5c6541cbd (diff) | |
| download | youtube-dl-320becd6920421b07326c245a06b996adc2b4397.tar.gz youtube-dl-320becd6920421b07326c245a06b996adc2b4397.tar.xz youtube-dl-320becd6920421b07326c245a06b996adc2b4397.zip | |
Remove trails from the "append_const" change (fixes issue #23)
| -rwxr-xr-x | youtube-dl | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/youtube-dl b/youtube-dl index 7532a142f..5ead5e4c9 100755 --- a/youtube-dl +++ b/youtube-dl @@ -1117,13 +1117,6 @@ if __name__ == '__main__': if numeric_limit is None: parser.error(u'invalid rate limit specified') opts.ratelimit = numeric_limit - if opts.format is not None and len(opts.format) > 1: - parser.error(u'pass at most one of the video format option flags (-f, -b, -m, -d)') - if opts.format is None: - real_format = None - else: - real_format = opts.format[0] - # Information extractors youtube_ie = YoutubeIE() @@ -1140,7 +1133,7 @@ if __name__ == '__main__': 'forceurl': opts.geturl, 'forcetitle': opts.gettitle, 'simulate': (opts.simulate or opts.geturl or opts.gettitle), - 'format': real_format, + 'format': opts.format, 'outtmpl': ((opts.outtmpl is not None and opts.outtmpl.decode(locale.getpreferredencoding())) or (opts.usetitle and u'%(stitle)s-%(id)s.%(ext)s') or (opts.useliteral and u'%(title)s-%(id)s.%(ext)s') |