Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						25ffaf5277 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						... 
						
						
						
						* qatar/master:
  compat: Add missing license boilerplates
Conflicts:
	compat/tms470/math.h
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-07-19 11:08:38 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						c88503e3f6 
					 
					
						
						
							
							Merge commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da'  
						
						... 
						
						
						
						* commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da':
  Employ consistent LIBAV_COMPAT_ multiple inclusion guards in compat/
Conflicts:
	compat/aix/math.h
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-07-19 10:56:10 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						910042072a 
					 
					
						
						
							
							compat: Add missing license boilerplates  
						
						
						
						
					 
					
						2013-07-18 18:12:38 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						439902e0d6 
					 
					
						
						
							
							Employ consistent LIBAV_COMPAT_ multiple inclusion guards in compat/  
						
						... 
						
						
						
						Also fix a comment and an #endif comment. 
						
						
					 
					
						2013-07-18 18:12:38 +02:00 
						 
				 
			
				
					
						
							
							
								Mans Rullgard 
							
						 
					 
					
						
						
							
						
						b6f8d635f2 
					 
					
						
						
							
							build: tms470: work around glibc math.h problems  
						
						... 
						
						
						
						The glibc definitions of INFINITY and NAN do not work with the
tms470 compiler, nor do our usual fallbacks.
Signed-off-by: Mans Rullgard <mans@mansr.com > 
						
						
					 
					
						2012-10-13 18:21:36 +01:00