Michael Niedermayer 
								
							 
						 
						
							
							
							
							
								
							
							
								8381ab1437 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'qatar/master'  
							
							... 
							
							
							
							* qatar/master: (29 commits)
  ARM: disable ff_vector_fmul_vfp on VFPv3 systems
  ARM: check for VFPv3
  swscale: Remove unused variables in x86 code.
  doc: Drop DJGPP section, Libav now compiles out-of-the-box on FreeDOS.
  x86: Add appropriate ifdefs around certain AVX functions.
  cmdutils: use sws_freeContext() instead of av_freep().
  swscale: delay allocation of formatConvBuffer().
  swscale: fix build with --disable-swscale-alpha.
  movenc: Deprecate the global RTP hinting flag, use a private AVOption instead
  movenc: Add an AVClass for setting muxer specific options
  swscale: fix non-bitexact yuv2yuv[X2]() MMX/MMX2 functions.
  configure: report yasm/nasm presence properly
  tcp: make connect() timeout properly
  rawdec: factor video demuxer definitions into a macro.
  rtspdec: add initial_pause private option.
  lavf: deprecate AVFormatParameters.width/height.
  tty: add video_size private option.
  rawdec: add video_size private option.
  x11grab: add video_size private option.
  x11grab: factorize returning error codes.
  ...
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						
							2011-05-27 23:48:22 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Anton Khirnov 
								
							 
						 
						
							
							
							
							
								
							
							
								fa4924a358 
								
							 
						 
						
							
							
								
								rawdec: factor video demuxer definitions into a macro.  
							
							
							
						 
						
							2011-05-27 08:31:16 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Mans Rullgard 
								
							 
						 
						
							
							
							
							
								
							
							
								2912e87a6c 
								
							 
						 
						
							
							
								
								Replace FFmpeg with Libav in licence headers  
							
							... 
							
							
							
							Signed-off-by: Mans Rullgard <mans@mansr.com> 
							
						 
						
							2011-03-19 13:33:20 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Diego Elio Pettenò 
								
							 
						 
						
							
							
							
							
								
							
							
								66355be3c3 
								
							 
						 
						
							
							
								
								Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.  
							
							... 
							
							
							
							This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
(cherry picked from commit c6610a216e 
							
						 
						
							2011-01-28 03:15:34 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Diego Elio Pettenò 
								
							 
						 
						
							
							
							
							
								
							
							
								c6610a216e 
								
							 
						 
						
							
							
								
								Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.  
							
							... 
							
							
							
							This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts. 
							
						 
						
							2011-01-26 22:10:09 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Aurelien Jacobs 
								
							 
						 
						
							
							
							
							
								
							
							
								4ca31edcfe 
								
							 
						 
						
							
							
								
								split raw.c into rawdec.c and rawenc.c  
							
							... 
							
							
							
							Originally committed as revision 24997 to svn://svn.ffmpeg.org/ffmpeg/trunk 
							
						 
						
							2010-08-30 23:16:35 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Aurelien Jacobs 
								
							 
						 
						
							
							
							
							
								
							
							
								99392a6111 
								
							 
						 
						
							
							
								
								move h261 demuxer to its own file  
							
							... 
							
							
							
							Originally committed as revision 24980 to svn://svn.ffmpeg.org/ffmpeg/trunk 
							
						 
						
							2010-08-29 21:37:37 +00:00