Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						411cc5c46a 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						... 
						
						
						
						* 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 > 
						
						
					 
					
						2011-09-12 00:32:54 +02:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
							
						
						05bffc12c4 
					 
					
						
						
							
							avconv: move audio_sample_fmt to options context.  
						
						... 
						
						
						
						Also document it and replace undocumented and inconsistent
'-sample_fmt list' syntax with -sample_fmts. 
						
						
					 
					
						2011-09-11 17:29:55 +02:00 
						 
				 
			
				
					
						
							
							
								Jeff Downs 
							
						 
					 
					
						
						
							
						
						a09918335f 
					 
					
						
						
							
							Make all option parsing functions match the function pointer type through which they are called.  
						
						... 
						
						
						
						All option parsing functions now match the function pointer signature through
which they are called (int f(const char *, const char *), thereby working
reliably on all platforms.
Prefix all option processing functions with opt_ 
						
						
					 
					
						2011-06-30 11:49:48 -04:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						eb8bc57240 
					 
					
						
						
							
							cmdutils: remove OPT_FUNC2  
						
						... 
						
						
						
						Make ff* tools only accept opt_* functions taking two arguments.
The distinction between functions with one and two arguments is quite
pointless. Simplify parse_options() code. 
						
						
					 
					
						2011-05-28 18:23:05 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						26513856d6 
					 
					
						
						
							
							cmdutils: remove OPT_FUNC2  
						
						... 
						
						
						
						Make ff* tools only accept opt_* functions taking two arguments.
The distinction between functions with one and two arguments is quite
pointless. Simplify parse_options() code.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com > 
						
						
					 
					
						2011-05-28 09:40:19 -04:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						3f7bb42607 
					 
					
						
						
							
							Implement a -pix_fmts option for listing all the supported pixel  
						
						... 
						
						
						
						formats.
Originally committed as revision 20909 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-12-21 21:53:03 +00:00 
						 
				 
			
				
					
						
							
							
								Ramiro Polla 
							
						 
					 
					
						
						
							
						
						870e015048 
					 
					
						
						
							
							Add -?, -help, and --help as alternative options to get help.  
						
						... 
						
						
						
						Originally committed as revision 20906 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-12-21 02:20:13 +00:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						62d7566239 
					 
					
						
						
							
							Implement a -filters option, listing all the available libavfilter  
						
						... 
						
						
						
						filters.
Currently filters are not registered, so the option will show none.
Originally committed as revision 20807 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-12-12 16:18:11 +00:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						992f8eaee7 
					 
					
						
						
							
							Factorize common commandline options definition.  
						
						... 
						
						
						
						Originally committed as revision 20664 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-11-29 23:12:19 +00:00