* qatar/master: (31 commits) audioconvert: add explanatory comments to channel_names array audioconvert: K&R whitespace cosmetics avconv: use correct index when selecting metadata to write to. avconv: fix inverted variable doc/avconv: document option types (input/output/per-stream/...) doc/avtools-common-opts: write a section about stream specifiers. doc/avconv: remove two pointless paragraphs. doc/avconv: document that global options should be specified first. doc/avconv: remove entries for nonexistent options doc/avconv: remove documentation for removed 'timestamp' option doc: cosmetics, rename fftools-common-opts to avtools-.... avconv: move streamid_map to options context. avconv: extend -vf syntax avconv: move top_field_first to options context. avconv: move inter/intra matrix to options context. avconv: remove -psnr option. avconv: remove me_threshold option. avconv: move video_rc_override_string to options context. avconv: move frame pixel format to the options context. avconv: move frame aspect ratio to the options context. ... Conflicts: avconv.c cmdutils_common_opts.h doc/avconv.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			15 lines
		
	
	
		
			1.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			15 lines
		
	
	
		
			1.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
    { "L", OPT_EXIT, {(void*)opt_license}, "show license" },
 | 
						|
    { "h", OPT_EXIT, {(void*)opt_help}, "show help" },
 | 
						|
    { "?", OPT_EXIT, {(void*)opt_help}, "show help" },
 | 
						|
    { "help", OPT_EXIT, {(void*)opt_help}, "show help" },
 | 
						|
    { "-help", OPT_EXIT, {(void*)opt_help}, "show help" },
 | 
						|
    { "version", OPT_EXIT, {(void*)opt_version}, "show version" },
 | 
						|
    { "formats"  , OPT_EXIT, {(void*)opt_formats  }, "show available formats" },
 | 
						|
    { "codecs"   , OPT_EXIT, {(void*)opt_codecs   }, "show available codecs" },
 | 
						|
    { "bsfs"     , OPT_EXIT, {(void*)opt_bsfs     }, "show available bit stream filters" },
 | 
						|
    { "protocols", OPT_EXIT, {(void*)opt_protocols}, "show available protocols" },
 | 
						|
    { "filters",   OPT_EXIT, {(void*)opt_filters  }, "show available filters" },
 | 
						|
    { "pix_fmts" , OPT_EXIT, {(void*)opt_pix_fmts }, "show available pixel formats" },
 | 
						|
    { "sample_fmts", OPT_EXIT, {.func_arg = show_sample_fmts }, "show available audio sample formats" },
 | 
						|
    { "loglevel", HAS_ARG, {(void*)opt_loglevel}, "set libav* logging level", "loglevel" },
 |