Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						542562e5ab 
					 
					
						
						
							
							avcodec/gsm_parser: Replace codec_id check by assert  
						
						... 
						
						
						
						A parser should never be called with a mismatching codec
Found-by: Ganesh Ajjanagadde <gajjanag@mit.edu >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc > 
						
						
					 
					
						2015-08-12 01:00:20 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						8c87658fdc 
					 
					
						
						
							
							Merge commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0'  
						
						... 
						
						
						
						* commit 'a16577d9857206089fd8bce6a342b31dbd7fb9b0':
  MSN Audio support
Conflicts:
	libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-11-26 12:37:20 +01:00 
						 
				 
			
				
					
						
							
							
								Kostya Shishkov 
							
						 
					 
					
						
						
							
						
						a16577d985 
					 
					
						
						
							
							MSN Audio support  
						
						... 
						
						
						
						This is essentially a MS GSM decoder extension that supports more
sampling rates and lower bitrates.
Signed-off-by: Anton Khirnov <anton@khirnov.net > 
						
						
					 
					
						2013-11-26 08:31:10 +01:00 
						 
				 
			
				
					
						
							
							
								Thilo Borgmann 
							
						 
					 
					
						
						
							
						
						d814a839ac 
					 
					
						
						
							
							Reinstate proper FFmpeg license for all files.  
						
						
						
						
					 
					
						2013-08-30 15:47:38 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						4d2f83f8ac 
					 
					
						
						
							
							gsm_parser: fix infinite loop  
						
						... 
						
						
						
						Fixes Ticket1894
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-11-07 18:08:23 +01:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
							
						
						36ef5369ee 
					 
					
						
						
							
							Replace all CODEC_ID_* with AV_CODEC_ID_*  
						
						
						
						
					 
					
						2012-08-07 16:00:24 +02:00 
						 
				 
			
				
					
						
							
							
								Justin Ruggles 
							
						 
					 
					
						
						
							
						
						2460b168b4 
					 
					
						
						
							
							gsm parser: set duration  
						
						
						
						
					 
					
						2012-02-20 15:08:41 -05:00 
						 
				 
			
				
					
						
							
							
								Justin Ruggles 
							
						 
					 
					
						
						
							
						
						82390f57d1 
					 
					
						
						
							
							avcodec: add GSM parser  
						
						... 
						
						
						
						The WAVE demuxer returns packets with many blocks per frame, which needs to be
parsed into single blocks. This has a side-effect of fixing the timestamps. 
						
						
					 
					
						2012-01-11 08:56:24 -05:00