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
..
arm
bfin	Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87'	2014-03-14 01:56:25 +01:00
ppc
x86	swscale/x86/swscale_template: loose hardcoded dstw_offset	2014-04-08 18:39:39 +02:00
bayer_template.c
colorspace-test.c
input.c	Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3'	2014-04-09 03:36:38 +02:00
libswscale.v
Makefile
options.c	swscale: add two spatially stable dithering methods	2014-03-25 13:48:06 +01:00
output.c	Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3'	2014-04-09 03:36:38 +02:00
rgb2rgb_template.c
rgb2rgb.c
rgb2rgb.h
swscale_internal.h	Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3'	2014-04-09 03:36:38 +02:00
swscale_unscaled.c	Merge commit '0ca0924c10d9617a5793964bf79655424ef32b68'	2014-04-02 17:46:19 +02:00
swscale-test.c
swscale.c	swscale/swscale: fix integer overflow	2014-03-24 05:01:32 +01:00
swscale.h
swscaleres.rc
utils.c	Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3'	2014-04-09 03:36:38 +02:00
version.h	swscale: add full bgra64 support	2014-04-02 19:44:08 +02:00
yuv2rgb.c	Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'	2014-03-13 22:35:47 +01:00