Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							85cf049d50 
							
						 
					 
					
						
						
							
							Merge commit '963f76144897d3f7684d82ec21e51dd50ea1106e'  
						
						... 
						
						
						
						* commit '963f76144897d3f7684d82ec21e51dd50ea1106e':
  avresample: Make sure the even check does not overflow
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2014-10-18 22:53:23 +02:00 
						 
				 
			
				
					
						
							
							
								Luca Barbato 
							
						 
					 
					
						
						
						
						
							
						
						
							963f761448 
							
						 
					 
					
						
						
							
							avresample: Make sure the even check does not overflow  
						
						... 
						
						
						
						CC: libav-stable@libav.org 
Bug-Id: CID 732225 
						
						
					 
					
						2014-10-18 16:15:10 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							b08f554fdc 
							
						 
					 
					
						
						
							
							Merge commit '76a75c523cd3c63560185394a0a5cd7249db962a'  
						
						... 
						
						
						
						* commit '76a75c523cd3c63560185394a0a5cd7249db962a':
  lavr: mix front center channel as indicated in the ATSC A/52 specification.
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2014-02-08 18:38:17 +01:00 
						 
				 
			
				
					
						
							
							
								Tim Walker 
							
						 
					 
					
						
						
						
						
							
						
						
							76a75c523c 
							
						 
					 
					
						
						
							
							lavr: mix front center channel as indicated in the ATSC A/52 specification.  
						
						... 
						
						
						
						When mixing 3 front channels into 2, the center channel is mixed into left and right with the center mix level, not -3dB. 
						
						
					 
					
						2014-02-08 13:42:55 +01:00 
						 
				 
			
				
					
						
							
							
								Thilo Borgmann 
							
						 
					 
					
						
						
						
						
							
						
						
							d814a839ac 
							
						 
					 
					
						
						
							
							Reinstate proper FFmpeg license for all files.  
						
						
						
						
					 
					
						2013-08-30 15:47:38 +00:00 
						 
				 
			
				
					
						
							
							
								Justin Ruggles 
							
						 
					 
					
						
						
						
						
							
						
						
							14758e3211 
							
						 
					 
					
						
						
							
							lavr: temporarily store custom matrix in AVAudioResampleContext  
						
						... 
						
						
						
						This allows AudioMix to be treated the same way as other conversion contexts
and removes the requirement to allocate it at the same time as the
AVAudioResampleContext.
The current matrix get/set functions are split between the public interface
and AudioMix private functions. 
						
						
					 
					
						2012-12-11 14:00:32 -05:00 
						 
				 
			
				
					
						
							
							
								Tim Walker 
							
						 
					 
					
						
						
						
						
							
						
						
							b901c30da6 
							
						 
					 
					
						
						
							
							lavr/audio_mix_matrix: acknowledge the existence of LFE2.  
						
						... 
						
						
						
						Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com> 
						
						
					 
					
						2012-09-12 18:26:53 -04:00 
						 
				 
			
				
					
						
							
							
								Martin Storsjö 
							
						 
					 
					
						
						
						
						
							
						
						
							1d9c2dc89a 
							
						 
					 
					
						
						
							
							Don't include common.h from avutil.h  
						
						... 
						
						
						
						Signed-off-by: Martin Storsjö <martin@martin.st> 
						
						
					 
					
						2012-08-15 22:32:06 +03:00 
						 
				 
			
				
					
						
							
							
								Justin Ruggles 
							
						 
					 
					
						
						
						
						
							
						
						
							8821ae649e 
							
						 
					 
					
						
						
							
							lavr: fix handling of custom mix matrices  
						
						... 
						
						
						
						Adds some validation for changing parameters after setting the matrix and
fixes a bug in the conversion path setup. 
						
						
					 
					
						2012-08-04 10:28:22 -04:00 
						 
				 
			
				
					
						
							
							
								John Stebbins 
							
						 
					 
					
						
						
						
						
							
						
						
							3971be0eb5 
							
						 
					 
					
						
						
							
							Add Dolby/DPLII downmix support to libavresample  
						
						... 
						
						
						
						Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com> 
						
						
					 
					
						2012-06-18 10:55:00 -04:00 
						 
				 
			
				
					
						
							
							
								Justin Ruggles 
							
						 
					 
					
						
						
						
						
							
						
						
							4010d724e1 
							
						 
					 
					
						
						
							
							lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type  
						
						
						
						
					 
					
						2012-05-01 13:52:59 -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