James Almer 
							
						 
					 
					
						
						
							
						
						c99a882814 
					 
					
						
						
							
							avcodec/idctdsp: change {put,add}_pixels_clamped to ptrdiff_t line_size  
						
						... 
						
						
						
						Reviewed-by: Michael Niedermayer <michaelni@gmx.at >
Signed-off-by: James Almer <jamrial@gmail.com > 
						
						
					 
					
						2014-09-24 21:43:19 -03:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						5db23c07a3 
					 
					
						
						
							
							Merge commit '95c0cec03acec0a80cc1c7db48f3b2355d9e767b'  
						
						... 
						
						
						
						* commit '95c0cec03acec0a80cc1c7db48f3b2355d9e767b':
  idctdsp: Add global function pointers for {add|put}_pixels_clamped functions
Conflicts:
	libavcodec/arm/idctdsp_init_arm.c
	libavcodec/dct.h
	libavcodec/idctdsp.c
	libavcodec/jrevdct.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-09-03 03:19:40 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						95c0cec03a 
					 
					
						
						
							
							idctdsp: Add global function pointers for {add|put}_pixels_clamped functions  
						
						... 
						
						
						
						These function pointers already existed in the ARM code. Adding them globally
allows calls to the function pointers to access arch-optimized versions of the
functions transparently. 
						
						
					 
					
						2014-09-02 14:41:13 -07:00 
						 
				 
			
				
					
						
							
							
								James Almer 
							
						 
					 
					
						
						
							
						
						a8592db9bb 
					 
					
						
						
							
							avcodec/idctdsp: make add/put_pixels_clamped_c internal functions  
						
						... 
						
						
						
						This reduces code duplication and differences with the fork.
Signed-off-by: James Almer <jamrial@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-08-13 01:44:41 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						b051a1bbb9 
					 
					
						
						
							
							avcodec/arm/idctdsp_init_arm*: Only select non bitexact IDCTs by default when bitexact is not set  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-07-27 14:21:36 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						110420aac0 
					 
					
						
						
							
							Merge commit '4de8b60684ce13dff3e3d372dae4f49b9e53f755'  
						
						... 
						
						
						
						* commit '4de8b60684ce13dff3e3d372dae4f49b9e53f755':
  idct: Move arm-specific declarations to a header in the arm directory
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-07-21 01:56:22 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						4de8b60684 
					 
					
						
						
							
							idct: Move arm-specific declarations to a header in the arm directory  
						
						
						
						
					 
					
						2014-07-20 13:02:17 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						521f569734 
					 
					
						
						
							
							Merge commit '8b0dd4942aac320d1ca3c40fa7ea1be342c71273'  
						
						... 
						
						
						
						* commit '8b0dd4942aac320d1ca3c40fa7ea1be342c71273':
  idctdsp: prettyprinting cosmetics
Conflicts:
	libavcodec/idctdsp.c
	libavcodec/ppc/idctdsp.c
	libavcodec/x86/idctdsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-07-18 22:16:04 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						42d326353c 
					 
					
						
						
							
							Merge commit 'b4987f72197e0c62cf2633bf835a9c32d2a445ae'  
						
						... 
						
						
						
						* commit 'b4987f72197e0c62cf2633bf835a9c32d2a445ae':
  idct: Convert IDCT permutation #defines to an enum
Conflicts:
	libavcodec/idctdsp.c
	libavcodec/x86/cavsdsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-07-18 22:01:17 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						8b0dd4942a 
					 
					
						
						
							
							idctdsp: prettyprinting cosmetics  
						
						
						
						
					 
					
						2014-07-18 07:51:03 -07:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						b4987f7219 
					 
					
						
						
							
							idct: Convert IDCT permutation #defines to an enum  
						
						... 
						
						
						
						Also rename the enum values to be consistent with other DCT permutations. 
						
						
					 
					
						2014-07-18 07:51:03 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						581b5f0b9b 
					 
					
						
						
							
							Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'  
						
						... 
						
						
						
						* commit 'e3fcb14347466095839c2a3c47ebecff02da891e':
  dsputil: Split off IDCT bits into their own context
Conflicts:
	configure
	libavcodec/aic.c
	libavcodec/arm/Makefile
	libavcodec/arm/dsputil_init_arm.c
	libavcodec/arm/dsputil_init_armv6.c
	libavcodec/asvdec.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/dvdec.c
	libavcodec/dxva2_mpeg2.c
	libavcodec/intrax8.c
	libavcodec/mdec.c
	libavcodec/mjpegdec.c
	libavcodec/mjpegenc_common.h
	libavcodec/mpegvideo.c
	libavcodec/ppc/dsputil_altivec.h
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/ppc/idctdsp.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-07-01 15:22:11 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						e3fcb14347 
					 
					
						
						
							
							dsputil: Split off IDCT bits into their own context  
						
						
						
						
					 
					
						2014-06-30 07:58:46 -07:00