Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							6841c8c579 
							
						 
					 
					
						
						
							
							Merge remote branch 'qatar/master'  
						
						... 
						
						
						
						* qatar/master:
  log: Fix an oob array read.
  cosmetics: trim trailing whitespace in postproc
  Ban strncpy() it's too easy to misuse.
  psymodel: Remove wrapper functions.
  aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'.
  regtest: remove redundant flags in jpg test
  regtest: use run_ffmpeg in do_image_formats
  regtest: simplify encoding functions
  ffmpeg.c: check for interlaced flag in the correct place.
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2011-05-09 04:50:56 +02:00 
						 
				 
			
				
					
						
							
							
								Nathan Caldwell 
							
						 
					 
					
						
						
						
						
							
						
						
							b58e298572 
							
						 
					 
					
						
						
							
							psymodel: Remove wrapper functions.  
						
						... 
						
						
						
						Instead use the function pointers directly. 
						
						
					 
					
						2011-05-08 12:43:04 -07:00 
						 
				 
			
				
					
						
							
							
								Mans Rullgard 
							
						 
					 
					
						
						
						
						
							
						
						
							2912e87a6c 
							
						 
					 
					
						
						
							
							Replace FFmpeg with Libav in licence headers  
						
						... 
						
						
						
						Signed-off-by: Mans Rullgard <mans@mansr.com> 
						
						
					 
					
						2011-03-19 13:33:20 +00:00 
						 
				 
			
				
					
						
							
							
								Justin Ruggles 
							
						 
					 
					
						
						
						
						
							
						
						
							99c2111b12 
							
						 
					 
					
						
						
							
							cosmetics: vertical alignment and line wrap  
						
						... 
						
						
						
						Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 75b98610a7ce7acf34f583a04aaccd8c619947fe) 
						
						
					 
					
						2011-01-21 20:36:01 +01:00 
						 
				 
			
				
					
						
							
							
								Justin Ruggles 
							
						 
					 
					
						
						
						
						
							
						
						
							20d1f6fec1 
							
						 
					 
					
						
						
							
							Add memory allocation failure checks to ff_iir_filter_init_coeffs().  
						
						... 
						
						
						
						Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d42dc217ed2b0f886ffc50b26c2bbff1fee5feca) 
						
						
					 
					
						2011-01-21 20:36:01 +01:00 
						 
				 
			
				
					
						
							
							
								Justin Ruggles 
							
						 
					 
					
						
						
						
						
							
						
						
							75b98610a7 
							
						 
					 
					
						
						
							
							cosmetics: vertical alignment and line wrap  
						
						... 
						
						
						
						Signed-off-by: Mans Rullgard <mans@mansr.com> 
						
						
					 
					
						2011-01-20 18:35:42 +00:00 
						 
				 
			
				
					
						
							
							
								Justin Ruggles 
							
						 
					 
					
						
						
						
						
							
						
						
							d42dc217ed 
							
						 
					 
					
						
						
							
							Add memory allocation failure checks to ff_iir_filter_init_coeffs().  
						
						... 
						
						
						
						Signed-off-by: Mans Rullgard <mans@mansr.com> 
						
						
					 
					
						2011-01-20 18:35:13 +00:00 
						 
				 
			
				
					
						
							
							
								Alex Converse 
							
						 
					 
					
						
						
						
						
							
						
						
							0e107f7890 
							
						 
					 
					
						
						
							
							psymodel: Const correct FFPsyWindowInfo.  
						
						... 
						
						
						
						Originally committed as revision 24999 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-08-30 23:48:35 +00:00 
						 
				 
			
				
					
						
							
							
								Martin Storsjö 
							
						 
					 
					
						
						
						
						
							
						
						
							771c86c13d 
							
						 
					 
					
						
						
							
							Fix a leak in the AAC encoder  
						
						... 
						
						
						
						Originally committed as revision 24159 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-07-10 09:14:19 +00:00 
						 
				 
			
				
					
						
							
							
								Alex Converse 
							
						 
					 
					
						
						
						
						
							
						
						
							7ca4a72f47 
							
						 
					 
					
						
						
							
							10l: Revert r23867. It didn't make any sense.  
						
						... 
						
						
						
						Originally committed as revision 23868 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-06-28 21:40:38 +00:00 
						 
				 
			
				
					
						
							
							
								Alex Converse 
							
						 
					 
					
						
						
						
						
							
						
						
							9a3fe1ae6e 
							
						 
					 
					
						
						
							
							Make ff_psy_preprocess_end() act like av_freep().  
						
						... 
						
						
						
						Originally committed as revision 23867 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-06-28 21:36:19 +00:00 
						 
				 
			
				
					
						
							
							
								Alex Converse 
							
						 
					 
					
						
						
						
						
							
						
						
							636da41a20 
							
						 
					 
					
						
						
							
							aacenc: Don't lowpass the input unless specifically requested.  
						
						... 
						
						
						
						The heuristic for estimating a good cutoff is busted.
Originally committed as revision 22779 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-04-02 14:19:39 +00:00 
						 
				 
			
				
					
						
							
							
								Alex Converse 
							
						 
					 
					
						
						
						
						
							
						
						
							2876a9dbaf 
							
						 
					 
					
						
						
							
							Use cutoff frequency to adjust bandwidth in the generic psymodel preprocess.  
						
						... 
						
						
						
						Originally committed as revision 19429 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-07-14 05:22:23 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							c8f47d8b79 
							
						 
					 
					
						
						
							
							cosmetics: Remove unnecessary {} around if/for blocks;  
						
						... 
						
						
						
						move statements after if/for to the next line.
Originally committed as revision 19378 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-07-08 21:36:33 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							99d61d340c 
							
						 
					 
					
						
						
							
							cosmetics: prettyprinting, K&R style, break overly long lines  
						
						... 
						
						
						
						Originally committed as revision 19377 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-07-08 21:16:06 +00:00 
						 
				 
			
				
					
						
							
							
								Alex Converse 
							
						 
					 
					
						
						
						
						
							
						
						
							fd257dc4c0 
							
						 
					 
					
						
						
							
							Cosmetics: Pretty print the AAC encoder.  
						
						... 
						
						
						
						Originally committed as revision 19376 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-07-08 20:36:45 +00:00 
						 
				 
			
				
					
						
							
							
								Alex Converse 
							
						 
					 
					
						
						
						
						
							
						
						
							78e65cd772 
							
						 
					 
					
						
						
							
							Merge the AAC encoder from SoC svn. It is still considered experimental.  
						
						... 
						
						
						
						Originally committed as revision 19375 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-07-08 20:01:31 +00:00