Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							672c610d84 
							
						 
					 
					
						
						
							
							Merge commit 'f9279ee74936b4990fc46287c27816ef828cc06c'  
						
						... 
						
						
						
						* commit 'f9279ee74936b4990fc46287c27816ef828cc06c':
  dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h
Conflicts:
	libavcodec/imgconvert.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2014-03-22 22:23:04 +01:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							f9279ee749 
							
						 
					 
					
						
						
							
							dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h  
						
						
						
						
					 
					
						2014-03-22 06:17:29 -07:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							05563ccacc 
							
						 
					 
					
						
						
							
							dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl names  
						
						... 
						
						
						
						Also switch from "tbl" to "tab" name suffixes. 
						
						
					 
					
						2014-03-13 08:12:44 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							a0cfec2e2b 
							
						 
					 
					
						
						
							
							Merge commit 'ba42c852477e87f6e47a5587e8f7829c46c52032'  
						
						... 
						
						
						
						* commit 'ba42c852477e87f6e47a5587e8f7829c46c52032':
  bit_depth_template: Use file name as multiple inclusion guard
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2014-02-20 14:57:31 +01:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							ba42c85247 
							
						 
					 
					
						
						
							
							bit_depth_template: Use file name as multiple inclusion guard  
						
						
						
						
					 
					
						2014-02-20 04:16:15 -08:00 
						 
				 
			
				
					
						
							
							
								Thilo Borgmann 
							
						 
					 
					
						
						
						
						
							
						
						
							d814a839ac 
							
						 
					 
					
						
						
							
							Reinstate proper FFmpeg license for all files.  
						
						
						
						
					 
					
						2013-08-30 15:47:38 +00:00 
						 
				 
			
				
					
						
							
							
								Martin Storsjö 
							
						 
					 
					
						
						
						
						
							
						
						
							9e0f14f16c 
							
						 
					 
					
						
						
							
							lavc: Make pointers to ff_cropTbl const  
						
						... 
						
						
						
						There's no point in these pointers not being const.
Signed-off-by: Martin Storsjö <martin@martin.st> 
						
						
					 
					
						2013-04-08 12:38:33 +03:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							c242bbd8b6 
							
						 
					 
					
						
						
							
							Remove unnecessary dsputil.h #includes  
						
						
						
						
					 
					
						2013-02-26 00:51:34 +01:00 
						 
				 
			
				
					
						
							
							
								Ronald S. Bultje 
							
						 
					 
					
						
						
						
						
							
						
						
							5e74a2b685 
							
						 
					 
					
						
						
							
							bit_depth_template: don't depend on dsputil.h.  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-11 01:03:45 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							81a11452f8 
							
						 
					 
					
						
						
							
							Merge commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf'  
						
						... 
						
						
						
						* commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf':
  dsputil: Move rnd_avg inline functions to a separate header
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-09 14:22:05 +01:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							bf6b3ec924 
							
						 
					 
					
						
						
							
							dsputil: Move rnd_avg inline functions to a separate header  
						
						
						
						
					 
					
						2013-02-08 23:10:17 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							0fdb4dfd03 
							
						 
					 
					
						
						
							
							h264: Fix some mixed declarations and code.  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-03-13 22:10:02 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							263bb6edcf 
							
						 
					 
					
						
						
							
							bit_depth_template: use av_clip_uint8 over crop_tab.  
						
						... 
						
						
						
						This fixes some global out of array reads and wrong cliping.
No speed difference meassurable under clang on i5
also all important code paths on all important platforms should
use SIMD.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-03-05 03:05:21 +01:00 
						 
				 
			
				
					
						
							
							
								Mans Rullgard 
							
						 
					 
					
						
						
						
						
							
						
						
							39c2a6bf44 
							
						 
					 
					
						
						
							
							bitdepth: simplify FUNC/FUNCC macros  
						
						... 
						
						
						
						Signed-off-by: Mans Rullgard <mans@mansr.com> 
						
						
					 
					
						2011-07-10 17:56:06 +01:00 
						 
				 
			
				
					
						
							
							
								Mans Rullgard 
							
						 
					 
					
						
						
						
						
							
						
						
							0f6fc8660e 
							
						 
					 
					
						
						
							
							9/10-bit: simplify clipping macros  
						
						... 
						
						
						
						Signed-off-by: Mans Rullgard <mans@mansr.com> 
						
						
					 
					
						2011-07-10 17:54:41 +01:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							c45f629576 
							
						 
					 
					
						
						
							
							Rename libavcodec/high_bit_depth.h ---> libavcodec/bit_depth_template.c  
						
						... 
						
						
						
						This naming scheme is used elsewhere, so it's sensible to be consistent. 
						
						
					 
					
						2011-07-05 17:38:37 +02:00