Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						ebb21887b8 
					 
					
						
						
							
							Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'  
						
						... 
						
						
						
						* commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8':
  x86: Drop some unnecessary YASM ifdefs
Conflicts:
	libavfilter/x86/vf_yadif_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-04-05 19:16:39 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						01c5779f56 
					 
					
						
						
							
							x86: Drop some unnecessary YASM ifdefs  
						
						... 
						
						
						
						Dead code elimination is enough to avoid undefined references in these cases. 
						
						
					 
					
						2014-04-04 19:08:05 +02:00 
						 
				 
			
				
					
						
							
							
								Thilo Borgmann 
							
						 
					 
					
						
						
							
						
						d814a839ac 
					 
					
						
						
							
							Reinstate proper FFmpeg license for all files.  
						
						
						
						
					 
					
						2013-08-30 15:47:38 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						3ac7fa81b2 
					 
					
						
						
							
							Consistently use "cpu_flags" as variable/parameter name for CPU flags  
						
						
						
						
					 
					
						2013-07-18 00:31:35 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						b6649ab503 
					 
					
						
						
							
							cosmetics: Remove unnecessary extern keywords from function declarations  
						
						
						
						
					 
					
						2013-03-27 14:21:45 +01:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						e0c6cce447 
					 
					
						
						
							
							x86: Replace checks for CPU extensions and flags by convenience macros  
						
						... 
						
						
						
						This separates code relying on inline from that relying on external
assembly and fixes instances where the coalesced check was incorrect. 
						
						
					 
					
						2012-09-08 18:18:34 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						a886b279a0 
					 
					
						
						
							
							x86: cosmetics: Comment some #endifs for better readability  
						
						
						
						
					 
					
						2012-08-30 18:50:33 +02:00 
						 
				 
			
				
					
						
							
							
								Justin Ruggles 
							
						 
					 
					
						
						
							
						
						2f096bb10e 
					 
					
						
						
							
							lavr: add x86-optimized mixing functions  
						
						... 
						
						
						
						Adds optimized functions for mixing 3 through 8 input channels to 1 and 2
output channels in fltp or s16p format with flt coeffs. 
						
						
					 
					
						2012-07-27 11:25:48 -04:00 
						 
				 
			
				
					
						
							
							
								Justin Ruggles 
							
						 
					 
					
						
						
							
						
						f61ce90caa 
					 
					
						
						
							
							lavr: add x86-optimized functions for mixing 1-to-2 s16p with flt coeffs  
						
						
						
						
					 
					
						2012-06-18 11:24:10 -04:00 
						 
				 
			
				
					
						
							
							
								Justin Ruggles 
							
						 
					 
					
						
						
							
						
						29f7490c46 
					 
					
						
						
							
							lavr: add x86-optimized functions for mixing 1-to-2 fltp with flt coeffs  
						
						
						
						
					 
					
						2012-06-18 11:24:10 -04:00 
						 
				 
			
				
					
						
							
							
								Justin Ruggles 
							
						 
					 
					
						
						
							
						
						b75726cb79 
					 
					
						
						
							
							lavr: add x86-optimized function for mixing 2 to 1 s16p with q8 coeffs  
						
						
						
						
					 
					
						2012-05-29 15:33:25 -04:00 
						 
				 
			
				
					
						
							
							
								Justin Ruggles 
							
						 
					 
					
						
						
							
						
						c140fb2cbc 
					 
					
						
						
							
							lavr: add x86-optimized functions for mixing 2 to 1 s16p with float coeffs  
						
						
						
						
					 
					
						2012-05-29 15:33:18 -04:00 
						 
				 
			
				
					
						
							
							
								Justin Ruggles 
							
						 
					 
					
						
						
							
						
						c8af852b97 
					 
					
						
						
							
							Add libavresample  
						
						... 
						
						
						
						This is a new library for audio sample format, channel layout, and sample rate
conversion. 
						
						
					 
					
						2012-04-24 21:28:27 -04:00