* qatar/master: mpeg4dec: use unsigned type for startcode in ff_mpeg4_decode_picture_header mpeg124: use sign_extend() function ac3dec: use get_sbits() instead of manually sign-extending 4xm: fix signed overflow wmavoice: fix a signed overflow mpegvideo_enc: fix a signed overflow crc: fix signed overflow fate: run avconv with -nostats flag avtools: add -v as alias for -loglevel avconv: always print stats with AV_LOG_INFO doc/avconv: add forgotten output/per-stream info to -filter avconv: add -stats option to enable/disable printing encoding progress avconv: in output_packet() don't set decoded_data_size for video. avconv: remove pointless always true condition avconv: factorize common code in transcode_init() zmbv: remove memcpy() of decoded frame mpeg12enc: use sign_extend() function h264pred: use unsigned types for pixel values, fix signed overflows h264: fix signed overflows in x*0x01010101 expressions h264pred: remove unused variables Conflicts: avconv.c tests/fate-run.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			16 lines
		
	
	
		
			1.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			16 lines
		
	
	
		
			1.1 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" },
 | 
						|
    { "v", HAS_ARG, {(void*)opt_loglevel}, "set libav* logging level", "loglevel" },
 |