Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						01cac26f68 
					 
					
						
						
							
							Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'  
						
						... 
						
						
						
						* commit '1909f6b1b6da2db371c179bed5a19aaf979b7557':
  swscale: cosmetics: Drop silly camelCase from swScale function pointer name
Conflicts:
	libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-08-29 15:56:03 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						5ff1b588eb 
					 
					
						
						
							
							Merge commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19'  
						
						... 
						
						
						
						* commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19':
  swscale: ppc: Hide arch-specific initialization details
Conflicts:
	libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-08-29 15:10:09 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						29daad5b98 
					 
					
						
						
							
							Merge commit 'f61bece684d9685b07895508e6c1c733b5564ccf'  
						
						... 
						
						
						
						* commit 'f61bece684d9685b07895508e6c1c733b5564ccf':
  ppc: Add and use convenience macro to check for AltiVec availability
Conflicts:
	libavcodec/ppc/dsputil_ppc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-08-29 14:24:07 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						79aec43ce8 
					 
					
						
						
							
							x86: Add and use more convenience macros to check CPU extension availability  
						
						
						
						
					 
					
						2013-08-29 13:07:37 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						1909f6b1b6 
					 
					
						
						
							
							swscale: cosmetics: Drop silly camelCase from swScale function pointer name  
						
						
						
						
					 
					
						2013-08-29 10:23:54 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						c2503d9c8a 
					 
					
						
						
							
							swscale: ppc: Hide arch-specific initialization details  
						
						... 
						
						
						
						Also give consistent names to init functions. 
						
						
					 
					
						2013-08-29 10:23:41 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						f61bece684 
					 
					
						
						
							
							ppc: Add and use convenience macro to check for AltiVec availability  
						
						
						
						
					 
					
						2013-08-28 23:54:15 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						23b3141261 
					 
					
						
						
							
							swscale: improve dither checks  
						
						... 
						
						
						
						Bssed on patch by Øyvind Kolås <pippin@gimp.org >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-08-19 18:33:50 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						8c50ea2251 
					 
					
						
						
							
							swscale: set dither to a specific value for rgb/bgr8 output  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-08-19 18:31:35 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						c14fc4585c 
					 
					
						
						
							
							Merge commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3'  
						
						... 
						
						
						
						* commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3':
  swscale: Move extern declarations for tables to swscale_internal.h
Conflicts:
	libswscale/output.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/utils.c
	libswscale/yuv2rgb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-08-16 12:56:48 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						1e0e193240 
					 
					
						
						
							
							sws: add dither enum  
						
						... 
						
						
						
						This allows specifying more dither algorithms without using up flags and
without ambiguities.
Also initialize the new field based on the flags and use it.
Note, improving the logic of the checks is left to subsequent
commits, this here only switches from flags to enum.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-08-15 21:39:32 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						aa2ba8c99e 
					 
					
						
						
							
							swscale: Move extern declarations for tables to swscale_internal.h  
						
						... 
						
						
						
						Also add missing ff_ prefixes where necessary. 
						
						
					 
					
						2013-08-15 14:38:03 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						8d745281a4 
					 
					
						
						
							
							swscale/utils: Fix potential overflow of srcPos*C  before converting to 64bit  
						
						... 
						
						
						
						Fixes CID1061054
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-08-08 02:56:26 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						bc721ac9f7 
					 
					
						
						
							
							swscale/utils: Fix potential overflow of dstPos*xInc before converting to 64bit  
						
						... 
						
						
						
						Fixes CID1061053
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-08-08 02:51:52 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						8efe96ee6f 
					 
					
						
						
							
							swscale/fill_rgb2yuv_table: fix default detection  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-07-27 01:11:37 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						a7e45cfa11 
					 
					
						
						
							
							swscale/sws_getColorspaceDetails: dont fail for non yuv  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-07-25 02:50:46 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						436616fd42 
					 
					
						
						
							
							swscale: exchange src & dst chroma pos  
						
						... 
						
						
						
						Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-07-24 22:43:50 +02:00 
						 
				 
			
				
					
						
							
							
								clook 
							
						 
					 
					
						
						
							
						
						b9b1a2c3e4 
					 
					
						
						
							
							libswscale: Adding RGB => XYZ support  
						
						
						
						
					 
					
						2013-07-23 01:02:41 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						b405f4e916 
					 
					
						
						
							
							swscale: Add support to specify chroma position  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-07-17 01:59:10 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						37f4aa133d 
					 
					
						
						
							
							swscale: move default colorspace setup to sws_init_filter()  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-07-16 02:44:25 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						c75dde6074 
					 
					
						
						
							
							swscale: call handle_format() from the functions that need it  
						
						... 
						
						
						
						This should fix some hypothetical issues with alloc/init_context() usage
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-07-14 03:36:19 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						0fc11e7bad 
					 
					
						
						
							
							swscale: make handle_formats() safe to be called multiple times  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-07-14 03:36:19 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						d5f5e51662 
					 
					
						
						
							
							swscale: move format handling to its own function  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-07-14 03:36:19 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						1ba01d3d46 
					 
					
						
						
							
							swscale: treat gray as a fullrage (0-255) format  
						
						... 
						
						
						
						Fixes Ticket2684
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-07-08 15:21:48 +02:00 
						 
				 
			
				
					
						
							
							
								Hendrik Leppkes 
							
						 
					 
					
						
						
							
						
						7cdf574c22 
					 
					
						
						
							
							swscale: fix filter alignment reduction without inline asm  
						
						... 
						
						
						
						Fixes scaling in MSVC/ICL, where inline asm is not present, but the
YASM scaling code is.
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-06-21 21:01:11 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						a90baa63c3 
					 
					
						
						
							
							add YUVJ411P  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-05-21 12:56:11 +02:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						e1746d057b 
					 
					
						
						
							
							swscale: RGBA64 output  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-05-12 21:47:19 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						63725d158d 
					 
					
						
						
							
							Revert "sws: support endianness conversion for AV_PIX_FMT_RGBA64"  
						
						... 
						
						
						
						This reverts commit 23f7b14f28 
						
						
					 
					
						2013-05-12 15:05:25 +02:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						23f7b14f28 
					 
					
						
						
							
							sws: support endianness conversion for AV_PIX_FMT_RGBA64  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-05-12 11:44:20 +00:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
							
						
						570d63eef3 
					 
					
						
						
							
							lavu: add FF_CEIL_RSHIFT and use it in various places.  
						
						
						
						
					 
					
						2013-05-09 16:59:42 +02:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						5c057433cc 
					 
					
						
						
							
							libswscale: GBRAP input & output and GBRAP16 input support  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-05-08 12:48:05 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						dce12f6948 
					 
					
						
						
							
							Merge commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c'  
						
						... 
						
						
						
						* commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c':
  swscale: support endianness conversion for AV_PIX_FMT_XYZ12
Conflicts:
	libswscale/swscale_unscaled.c
	libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-05-07 11:13:46 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						2060d94409 
					 
					
						
						
							
							Merge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491'  
						
						... 
						
						
						
						* commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491':
  swscale: add support for endianness only conversion
Conflicts:
	libswscale/utils.c
	libswscale/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-05-07 11:04:07 +02:00 
						 
				 
			
				
					
						
							
							
								Janne Grunau 
							
						 
					 
					
						
						
							
						
						9cfa21c8c2 
					 
					
						
						
							
							swscale: support endianness conversion for AV_PIX_FMT_XYZ12  
						
						
						
						
					 
					
						2013-05-06 21:48:14 +02:00 
						 
				 
			
				
					
						
							
							
								Janne Grunau 
							
						 
					 
					
						
						
							
						
						c1eb3e7fec 
					 
					
						
						
							
							swscale: add support for endianness only conversion  
						
						... 
						
						
						
						Use bitfields in FormatEntry array to avoid wasting an int for each flag. 
						
						
					 
					
						2013-05-06 18:55:58 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						d5dbd84c9a 
					 
					
						
						
							
							Merge commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70'  
						
						... 
						
						
						
						* commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70':
  swscale: Add av_cold attributes to init functions missing them
Conflicts:
	libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-05-05 13:00:21 +02:00 
						 
				 
			
				
					
						
							
							
								Reimar Döffinger 
							
						 
					 
					
						
						
							
						
						3bb1c58e95 
					 
					
						
						
							
							Avoid incorrect deprecated pixel format warning.  
						
						... 
						
						
						
						Should only be printed if a "JPEG" format was used,
not for e.g. XYZ.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de > 
						
						
					 
					
						2013-05-05 10:01:22 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						2b677ffca5 
					 
					
						
						
							
							swscale: Add av_cold attributes to init functions missing them  
						
						
						
						
					 
					
						2013-05-04 22:48:05 +02:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						e6d4e68755 
					 
					
						
						
							
							lavu: add planar 16 bit and 8 bit rgb with alpha  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-05-03 16:58:22 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						2514b80045 
					 
					
						
						
							
							sws: share xyzgamma tables.  
						
						... 
						
						
						
						They are currently always constant and thus theres no point to
store them in the context.
This makes the context 16kb smaller
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-05-01 17:52:18 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						0c47c9028b 
					 
					
						
						
							
							sws: support xyz input  
						
						... 
						
						
						
						The implementation is heavily based on Matthias Buerchers and Nicolas Bertrands vf_xyz2rgb.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-04-28 19:30:01 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						45f1cf88a8 
					 
					
						
						
							
							sws: remove hack to support partial convert / xyz bswaping  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-04-28 19:20:06 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						2fa08abdb6 
					 
					
						
						
							
							sws: enable xyz12, this for now is just for swaping between le and be  
						
						... 
						
						
						
						Needed for fixing fate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-04-28 15:53:20 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						13bbfb8fda 
					 
					
						
						
							
							sws: Skip ff_yuv2rgb_c_init_tables() when the output is YUV  
						
						... 
						
						
						
						Fixes "20bpp not supported by yuv2rgb" warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-04-16 17:50:43 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						f05cfb654f 
					 
					
						
						
							
							sws/fill_rgb2yuv_table: use ROUNDED_DIV  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-04-16 11:33:40 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						bcf643486f 
					 
					
						
						
							
							sws/fill_rgb2yuv_table: increase precission to 32bit  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-04-16 11:33:40 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						2fa11a94a3 
					 
					
						
						
							
							sws/fill_rgb2yuv_table: avoid 2 divisions  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-04-16 11:13:20 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						3950236332 
					 
					
						
						
							
							sws/x86: update RENAME(rgb24toyv12)() to using the user provided rgb2yuv table  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-04-15 21:44:50 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						2a5d1cb2d9 
					 
					
						
						
							
							sws/x86: update rgba->yuv to use user supplied table  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-04-15 01:31:01 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						17ad06c753 
					 
					
						
						
							
							sws/x86: update rgb/bgr->yuv code to use provided coefficient table  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-04-15 01:31:01 +02:00