Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						7d43fbe3ae 
					 
					
						
						
							
							Merge commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce'  
						
						 
						
						... 
						
						
						
						* commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce':
  dca: K&R formatting cosmetics
Conflicts:
	libavcodec/dca_parser.c
	libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-09-16 20:31:02 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gabriel Dume 
							
						 
					 
					
						
						
							
						
						45ff7c93dd 
					 
					
						
						
							
							dca: K&R formatting cosmetics  
						
						 
						
						... 
						
						
						
						Signed-off-by: Diego Biurrun <diego@biurrun.de > 
						
						
					 
					
						2014-09-16 04:42:32 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Benjamin Larsson 
							
						 
					 
					
						
						
							
						
						6f02853d14 
					 
					
						
						
							
							Fix huffman coded dca samples.  
						
						 
						
						... 
						
						
						
						Originally committed as revision 15733 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2008-10-28 14:43:06 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Stefan Gehrer 
							
						 
					 
					
						
						
							
						
						cf2baeb338 
					 
					
						
						
							
							mark read-only data as const  
						
						 
						
						... 
						
						
						
						Originally committed as revision 13947 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2008-06-24 20:01:31 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kostya Shishkov 
							
						 
					 
					
						
						
							
						
						01ca9ac334 
					 
					
						
						
							
							DCA decoder  
						
						 
						
						... 
						
						
						
						Originally committed as revision 8141 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-02-27 06:30:40 +00: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