Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							e8676c758a 
							
						 
					 
					
						
						
							
							Merge commit '72cebae0d981dde144340cf51f3c323f01e215e5'  
						
						... 
						
						
						
						* commit '72cebae0d981dde144340cf51f3c323f01e215e5':
  ppc: avutil: Use the abriged vector types
Conflicts:
	libavutil/ppc/float_dsp_altivec.c
	libavutil/ppc/util_altivec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2015-05-31 21:38:58 +02:00 
						 
				 
			
				
					
						
							
							
								Luca Barbato 
							
						 
					 
					
						
						
						
						
							
						
						
							72cebae0d9 
							
						 
					 
					
						
						
							
							ppc: avutil: Use the abriged vector types  
						
						
						
						
					 
					
						2015-05-31 12:07:10 +02:00 
						 
				 
			
				
					
						
							
							
								Rong Yan 
							
						 
					 
					
						
						
						
						
							
						
						
							8e8db16a2c 
							
						 
					 
					
						
						
							
							avutil/ppc/float_dsp_altivec: ppc: Fix bug in ff_vector_fmul_add_altivec() affecting little endian environments on POWER8  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2014-09-11 18:36:34 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							6e6e170898 
							
						 
					 
					
						
						
							
							Merge commit '42d324694883cdf1fff1612ac70fa403692a1ad4'  
						
						... 
						
						
						
						* commit '42d324694883cdf1fff1612ac70fa403692a1ad4':
  floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp.
Conflicts:
	libavcodec/arm/dsputil_init_vfp.c
	libavcodec/arm/dsputil_vfp.S
	libavcodec/dsputil.c
	libavcodec/ppc/float_altivec.c
	libavcodec/x86/dsputil.asm
	libavutil/x86/float_dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-01-23 14:04:50 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							b1b870fbd7 
							
						 
					 
					
						
						
							
							Merge commit '55aa03b9f8f11ebb7535424cc0e5635558590f49'  
						
						... 
						
						
						
						* commit '55aa03b9f8f11ebb7535424cc0e5635558590f49':
  floatdsp: move vector_fmul_add from dsputil to avfloatdsp.
Conflicts:
	libavcodec/dsputil.c
	libavcodec/x86/dsputil.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-01-23 13:54:34 +01:00 
						 
				 
			
				
					
						
							
							
								Ronald S. Bultje 
							
						 
					 
					
						
						
						
						
							
						
						
							42d3246948 
							
						 
					 
					
						
						
							
							floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp.  
						
						... 
						
						
						
						Now, nellymoserenc and aacenc no longer depends on dsputil. Independent
of this patch, wmaprodec also does not depend on dsputil, so I removed
it from there also. 
						
						
					 
					
						2013-01-22 11:55:42 -08:00 
						 
				 
			
				
					
						
							
							
								Ronald S. Bultje 
							
						 
					 
					
						
						
						
						
							
						
						
							55aa03b9f8 
							
						 
					 
					
						
						
							
							floatdsp: move vector_fmul_add from dsputil to avfloatdsp.  
						
						
						
						
					 
					
						2013-01-22 11:55:42 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							5c7e9e16c9 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						... 
						
						
						
						* qatar/master:
  lavc: Move vector_fmul_window to AVFloatDSPContext
  rtpdec_mpeg4: Check the remaining amount of data before reading
Conflicts:
	libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-01-16 12:38:41 +01:00 
						 
				 
			
				
					
						
							
							
								Justin Ruggles 
							
						 
					 
					
						
						
						
						
							
						
						
							e034cc6c60 
							
						 
					 
					
						
						
							
							lavc: Move vector_fmul_window to AVFloatDSPContext  
						
						... 
						
						
						
						Signed-off-by: Luca Barbato <lu_zero@gentoo.org> 
						
						
					 
					
						2013-01-16 10:45:45 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							7e22514d98 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						... 
						
						
						
						* qatar/master:
  float_dsp: ppc: add a separate header for Altivec function prototypes
  ARM: fix float_dsp breakage from d5a7229
  Add a float DSP framework to libavutil
  PPC: Move types_altivec.h and util_altivec.h from libavcodec to libavutil
  ARM: Move asm.S from libavcodec to libavutil
  vc1dsp: mark put/avg_vc1_mspel_mc() always_inline
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-06-08 23:59:09 +02:00 
						 
				 
			
				
					
						
							
							
								Justin Ruggles 
							
						 
					 
					
						
						
						
						
							
						
						
							3b81a18ba3 
							
						 
					 
					
						
						
							
							float_dsp: ppc: add a separate header for Altivec function prototypes  
						
						... 
						
						
						
						Also include config.h so that HAVE_ALTIVEC will be defined.
Fixes compilation on PPC with Altivec enabled. 
						
						
					 
					
						2012-06-08 14:52:01 -04:00 
						 
				 
			
				
					
						
							
							
								Justin Ruggles 
							
						 
					 
					
						
						
						
						
							
						
						
							d5a7229ba4 
							
						 
					 
					
						
						
							
							Add a float DSP framework to libavutil  
						
						... 
						
						
						
						Move vector_fmul() from DSPContext to AVFloatDSPContext. 
						
						
					 
					
						2012-06-08 13:14:38 -04:00