Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8ef57a0d61 
							
						 
					 
					
						
						
							
							Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'  
						
						... 
						
						
						
						* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
  cosmetics: Fix spelling mistakes
Merged-by: Clément Bœsch <u@pkh.me> 
						
						
					 
					
						2016-06-21 21:55:34 +02:00 
						 
				 
			
				
					
						
							
							
								Vittorio Giovara 
							
						 
					 
					
						
						
						
						
							
						
						
							41ed7ab45f 
							
						 
					 
					
						
						
							
							cosmetics: Fix spelling mistakes  
						
						... 
						
						
						
						Signed-off-by: Diego Biurrun <diego@biurrun.de> 
						
						
					 
					
						2016-05-04 18:16:21 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							0f40c90984 
							
						 
					 
					
						
						
							
							Drop pointless assert.h #includes  
						
						
						
						
					 
					
						2016-05-03 15:45:10 +02:00 
						 
				 
			
				
					
						
							
							
								Pedro Arthur 
							
						 
					 
					
						
						
						
						
							
						
						
							6de58b4903 
							
						 
					 
					
						
						
							
							swscale: cleanup unused code  
						
						... 
						
						
						
						Removed previous swscale code under '#ifndef NEW_FILTER'
and removed unused fields of SwsContext 
						
						
					 
					
						2016-03-31 16:36:16 -03:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							23261e6001 
							
						 
					 
					
						
						
							
							sws/output: fix ordered dither threshold for mono output  
						
						... 
						
						
						
						This makes sure that white stays white and black black
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2016-02-10 17:22:26 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							b99f498716 
							
						 
					 
					
						
						
							
							swscale/output: Assert that yalpha and uvalpha are within their expected range  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2016-01-14 21:58:02 +01:00 
						 
				 
			
				
					
						
							
							
								Ganesh Ajjanagadde 
							
						 
					 
					
						
						
						
						
							
						
						
							7cf22c7970 
							
						 
					 
					
						
						
							
							swscale/output: fix undefined left shifts of negative numbers  
						
						... 
						
						
						
						This fixes -Wshift-negative-value reported with clang 3.7+, e.g
http://fate.ffmpeg.org/log.cgi?time=20150918181527&log=compile&slot=x86_64-darwin-clang-polly-vectorize-stripmine-3.7 .
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2015-09-20 01:14:36 +02:00 
						 
				 
			
				
					
						
							
							
								Hendrik Leppkes 
							
						 
					 
					
						
						
						
						
							
						
						
							5d8e836d0e 
							
						 
					 
					
						
						
							
							Replace all remaining occurances of step/depth_minus1 and offset_plus1  
						
						
						
						
					 
					
						2015-09-08 17:10:48 +02:00 
						 
				 
			
				
					
						
							
							
								Hendrik Leppkes 
							
						 
					 
					
						
						
						
						
							
						
						
							151aa2ebff 
							
						 
					 
					
						
						
							
							Merge commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba'  
						
						... 
						
						
						
						* commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba':
  lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com> 
						
						
					 
					
						2015-09-08 16:35:28 +02:00 
						 
				 
			
				
					
						
							
							
								Vittorio Giovara 
							
						 
					 
					
						
						
						
						
							
						
						
							2268db2cd0 
							
						 
					 
					
						
						
							
							lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields  
						
						... 
						
						
						
						The new fields can be accessed directly and are more intelligible.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> 
						
						
					 
					
						2015-09-07 12:37:47 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							1909a9151c 
							
						 
					 
					
						
						
							
							swscale/output: Fix "warning: assignment from incompatible pointer type"  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2015-07-25 03:15:56 +02:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							3cb8eee6f7 
							
						 
					 
					
						
						
							
							swscale: ayuv64le output support  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2015-07-24 03:45:48 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							8255b14c68 
							
						 
					 
					
						
						
							
							swscale/output: fix input indexing in yuv2ya8_2_c()  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2015-07-04 00:03:45 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							ab80d3fb3a 
							
						 
					 
					
						
						
							
							swscale/output: fix null pointer dereference in yuv2ya8_2_c()  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2015-07-03 23:03:25 +02:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							2778fdbe54 
							
						 
					 
					
						
						
							
							swscale: implement YA8 output  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2015-07-02 17:36:05 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							e29d996149 
							
						 
					 
					
						
						
							
							swscale/output: Add rgba64/rgb48/bgra64/bgr48 output functions with full chroma interpolation  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2015-06-17 00:45:46 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							f140a99f8b 
							
						 
					 
					
						
						
							
							swscale/output: Factorize rgb48 and 64bit code  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2015-06-17 00:45:46 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							bdcd36a4c8 
							
						 
					 
					
						
						
							
							swscale/output: Fix undefined shifts  
						
						... 
						
						
						
						Fixes: da14e86d8462be6493eab16bc2d40f88/asan_heap-oob_204cfd2_528_cov_340150052_COMPRESS.BMP
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2015-03-25 18:31:25 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							03bffb68f6 
							
						 
					 
					
						
						
							
							swscale: Use av_clip_uintp2()  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2015-02-21 14:49:17 +01:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							928061670e 
							
						 
					 
					
						
						
							
							libswscale: GBRAP input & output and GBRAP16 input support  
						
						... 
						
						
						
						Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> 
						
						
					 
					
						2015-01-14 17:17:24 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							ed962414bd 
							
						 
					 
					
						
						
							
							Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3'  
						
						... 
						
						
						
						* commit '92b099daf4b8ef93513e38b43899cb8458a2fde3':
  swscale: support converting YVYU422 pixel format
Conflicts:
	libswscale/input.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2014-04-09 03:36:38 +02:00 
						 
				 
			
				
					
						
							
							
								Vittorio Giovara 
							
						 
					 
					
						
						
						
						
							
						
						
							92b099daf4 
							
						 
					 
					
						
						
							
							swscale: support converting YVYU422 pixel format  
						
						
						
						
					 
					
						2014-04-07 23:50:34 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							37f69cd93e 
							
						 
					 
					
						
						
							
							swscale: add full bgra64 support  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2014-04-02 19:44:08 +02:00 
						 
				 
			
				
					
						
							
							
								Øyvind Kolås 
							
						 
					 
					
						
						
						
						
							
						
						
							3e6016622e 
							
						 
					 
					
						
						
							
							swscale: add two spatially stable dithering methods  
						
						... 
						
						
						
						Both of these dithering methods are from http://pippin.gimp.org/a_dither/  for
GIF they can be considered better than bayer (provides more gray-levels), and
spatial stability - often more than twice as good compression and less visual
flicker than error diffusion methods (the methods also avoids error-shadow
artifacts of diffusion dithers).
These methods are similar to blue/green noise type dither masks; but are
simple enough to generate their mask on the fly. They are still research work
in progress; though more expensive to generate masks (which can be used in a
LUT) like 'void and cluster' and similar methods will yield superior results 
						
						
					 
					
						2014-03-25 13:48:06 +01: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 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							b154d203b1 
							
						 
					 
					
						
						
							
							swscale/output: silence warning about undefined 'ASSERT_LEVEL'  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-05-19 14:06:16 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							f4b2d3598b 
							
						 
					 
					
						
						
							
							swscale/output: remove unused header  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-05-19 14:04:14 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							e1efacf60b 
							
						 
					 
					
						
						
							
							sws/output: yuv2rgb_write() assert that alpha has the correct value in the tables  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-05-18 15:14:19 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							5918b7ac41 
							
						 
					 
					
						
						
							
							sws/output: init A1/A2 so that rgba64 ends with 0xffff in the absence of alpha input  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-05-18 01:20:30 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							c7c71f95f8 
							
						 
					 
					
						
						
							
							replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_*  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-05-15 11:23:14 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							e751481cd8 
							
						 
					 
					
						
						
							
							swscale/output: silence compiler warnings about uninitialized variables  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-05-14 18:58:02 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							145e644aee 
							
						 
					 
					
						
						
							
							sws/output: remove offset/coef for alpha in rgba64  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-05-12 22:01:18 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							7ded017983 
							
						 
					 
					
						
						
							
							sws/output/yuv2gbrp_full_X_c(): silence warning about uninitialized variable  
						
						... 
						
						
						
						clang did not show this one, so i missed it in the last batch
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-05-10 20:36:12 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							8ef453ff83 
							
						 
					 
					
						
						
							
							sws/output: silence warnings about uninitialized use of variables  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-05-10 01:33:57 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							41ebb64511 
							
						 
					 
					
						
						
							
							swscale/output: fix alpha scale in the new functions  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-04-14 16:57:09 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							a4b5e45e2b 
							
						 
					 
					
						
						
							
							sws/output: add yuv2rgb_full_1_c_template()  
						
						... 
						
						
						
						7500->4500 cycles on sandybridge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-04-14 16:57:09 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							9204a7dc8e 
							
						 
					 
					
						
						
							
							sws/output: add +yuv2rgb_full_2_c_template()  
						
						... 
						
						
						
						8100 cycles -> 5800 cycles on sandybridge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-04-14 15:32:11 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							662664551c 
							
						 
					 
					
						
						
							
							sws/output: factor yuv2rgb_write_full() out  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-04-14 13:29:58 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							42431a557e 
							
						 
					 
					
						
						
							
							Merge commit 'd6d5ef5534d582f9dbaf18ac2605cf5bb72cd821'  
						
						... 
						
						
						
						* commit 'd6d5ef5534d582f9dbaf18ac2605cf5bb72cd821':
  sws: GBRP9, GBRP10, and GBRP16 output support
Conflicts:
	libswscale/output.c
	libswscale/utils.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-10 13:49:53 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							d6d5ef5534 
							
						 
					 
					
						
						
							
							sws: GBRP9, GBRP10, and GBRP16 output support  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> 
						
						
					 
					
						2013-02-09 14:31:11 -05:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							bb2f4ae434 
							
						 
					 
					
						
						
							
							Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2'  
						
						... 
						
						
						
						* commit '05b0998f511ffa699407465d48c7d5805f746ad2':
  dsputil: Fix error by not using redzone and register name
  swscale: GBRP output support
Conflicts:
	libswscale/output.c
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/utils.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-01-28 14:11:31 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							4eb93bed4e 
							
						 
					 
					
						
						
							
							swscale: GBRP output support  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> 
						
						
					 
					
						2013-01-27 15:28:07 -05:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							e4033d89f1 
							
						 
					 
					
						
						
							
							sws: GBRP9, GBRP10 GBRP12 GBRP14 output support  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-01-26 06:11:52 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							61884d1985 
							
						 
					 
					
						
						
							
							sws: GBRP output support  
						
						... 
						
						
						
						Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-01-26 06:11:52 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							5c42078b99 
							
						 
					 
					
						
						
							
							sws: fix ED mono dither black level  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-01-19 04:21:44 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							ca447592b1 
							
						 
					 
					
						
						
							
							sws: rgb/bgr 4/8 error diffusion dither  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-01-19 02:38:48 +01:00