Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							6a7980e2cd 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						 
						
						... 
						
						
						
						* qatar/master:
  dct/fft: Give consistent names to fixed/float template files
Conflicts:
	libavcodec/fft_fixed.c
	libavcodec/fft_float.c
	libavcodec/mdct_fixed.c
	libavcodec/mdct_float.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-11-21 19:26:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							ac0e03bab0 
							
						 
					 
					
						
						
							
							dct/fft: Give consistent names to fixed/float template files  
						
						 
						
						
						
						
					 
					
						2013-11-21 15:59:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thilo Borgmann 
							
						 
					 
					
						
						
						
						
							
						
						
							d814a839ac 
							
						 
					 
					
						
						
							
							Reinstate proper FFmpeg license for all files.  
						
						 
						
						
						
						
					 
					
						2013-08-30 15:47:38 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mans Rullgard 
							
						 
					 
					
						
						
						
						
							
						
						
							6f2309ed2e 
							
						 
					 
					
						
						
							
							dct: build dct32 as separate object files  
						
						 
						
						... 
						
						
						
						This builds the float and fixed-point versions of dct32 separately
instead of #including the file in dct.c and mpegaudiodec.c.
Signed-off-by: Mans Rullgard <mans@mansr.com> 
						
						
					 
					
						2011-05-17 13:57:23 +01:00