Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						c55bebe2cc 
					 
					
						
						
							
							Merge commit '90558e848a29ef1e85ecb1832ad9a26eebe958e0'  
						
						... 
						
						
						
						* commit '90558e848a29ef1e85ecb1832ad9a26eebe958e0':
  rangecoder: K&R formatting cosmetics
Conflicts:
	libavcodec/rangecoder.c
	libavcodec/rangecoder.h
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-10-13 15:35:05 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						90558e848a 
					 
					
						
						
							
							rangecoder: K&R formatting cosmetics  
						
						
						
						
					 
					
						2012-10-12 20:56:54 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						f0a3259f9a 
					 
					
						
						
							
							rangecoder.h: use av_assert  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-06-24 20:18:00 +02: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 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						ba87f0801d 
					 
					
						
						
							
							Remove explicit filename from Doxygen @file commands.  
						
						... 
						
						
						
						Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.
Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-04-20 14:45:34 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						bad5537e2c 
					 
					
						
						
							
							Use full internal pathname in doxygen @file directives.  
						
						... 
						
						
						
						Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.
Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-02-01 02:00:19 +00:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						987903826b 
					 
					
						
						
							
							Globally rename the header inclusion guard names.  
						
						... 
						
						
						
						Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".
Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2008-08-31 07:39:47 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						245976da2a 
					 
					
						
						
							
							Use full path for #includes from another directory.  
						
						... 
						
						
						
						Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2008-05-09 11:56:36 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						5b21bdabe4 
					 
					
						
						
							
							Add FFMPEG_ prefix to all multiple inclusion guards.  
						
						... 
						
						
						
						Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-10-17 09:37:46 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						e5a389a1b7 
					 
					
						
						
							
							license header consistency cosmetics  
						
						... 
						
						
						
						Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-07-05 10:40:25 +00:00 
						 
				 
			
				
					
						
							
							
								Guillaume Poirier 
							
						 
					 
					
						
						
							
						
						efb775777f 
					 
					
						
						
							
							add a comment to indicate which #endif belong to which #define  
						
						... 
						
						
						
						Originally committed as revision 9356 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-06-17 18:59:28 +00:00 
						 
				 
			
				
					
						
							
							
								Måns Rullgård 
							
						 
					 
					
						
						
							
						
						699b3f99d0 
					 
					
						
						
							
							add multiple inclusion guards to headers  
						
						... 
						
						
						
						Originally committed as revision 9345 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-06-17 00:01:30 +00:00 
						 
				 
			
				
					
						
							
							
								Måns Rullgård 
							
						 
					 
					
						
						
							
						
						99545457bf 
					 
					
						
						
							
							include all prerequisites in header files  
						
						... 
						
						
						
						Originally committed as revision 9344 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-06-16 22:59:13 +00:00 
						 
				 
			
				
					
						
							
							
								Carl Eugen Hoyos 
							
						 
					 
					
						
						
							
						
						154e30f6c2 
					 
					
						
						
							
							rename attribute_unused to av_unused and moves its declaration to common.h  
						
						... 
						
						
						
						patch by Carl Eugen Hoyos cehoyos chez ag or at
original thread: [FFmpeg-devel] [PATCH] attribute_unused -> av_unused
date: 05/29/2007 01:23 PM
Originally committed as revision 9155 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-05-30 09:32:25 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						1e6b570087 
					 
					
						
						
							
							fix assertion failure  
						
						... 
						
						
						
						Originally committed as revision 9152 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-05-29 16:51:55 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						b78e7197a8 
					 
					
						
						
							
							Change license headers to say 'FFmpeg' instead of 'this program/this library'  
						
						... 
						
						
						
						and fix GPL/LGPL version mismatches.
Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2006-10-07 15:30:46 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						5509bffa88 
					 
					
						
						
							
							Update licensing information: The FSF changed postal address.  
						
						... 
						
						
						
						Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2006-01-12 22:43:26 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						115329f160 
					 
					
						
						
							
							COSMETICS: Remove all trailing whitespace.  
						
						... 
						
						
						
						Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2005-12-17 18:14:38 +00:00 
						 
				 
			
				
					
						
							
							
								Måns Rullgård 
							
						 
					 
					
						
						
							
						
						88730be651 
					 
					
						
						
							
							kill warnings patch by (Måns Rullgård <mru inprovide com>)  
						
						... 
						
						
						
						Originally committed as revision 3977 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2005-02-24 19:08:50 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						9b41cb1c41 
					 
					
						
						
							
							remove debug stuff  
						
						... 
						
						
						
						Originally committed as revision 3657 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2004-10-31 02:51:39 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						672a19aac2 
					 
					
						
						
							
							range coder  
						
						... 
						
						
						
						Originally committed as revision 3654 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2004-10-30 01:43:37 +00:00