Michael Niedermayer 6b1ca1709f Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30' ... * commit '1481d24c3a0abf81e1d7a514547bd5305232be30': RGBA64 pixel formats Conflicts: doc/APIchanges libavutil/pixdesc.c libavutil/pixfmt.h libavutil/version.h libswscale/utils.c See: 9569a3c9f41387a8c7d1ce97d8693520477a66c3 See: 92afb431621c79155fcb7171d26f137eb1bee028, as well as others Note: the enum values added in libav are incompatible/different to what ffmpeg used since 3 years Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-03-17 14:41:13 +01:00
..
arm	swscale: disable ARM code until its build failure with clang/iphone is fixed	2014-01-12 19:58:38 +01:00
bfin	Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87'	2014-03-14 01:56:25 +01:00
ppc
x86	Add missing external declarations.	2014-03-17 00:48:09 +01:00
bayer_template.c	libswscale: bayer to rgb24 & yv12 colorspace converters	2014-02-23 02:38:22 +01:00
colorspace-test.c
input.c
libswscale.v
Makefile
options.c
output.c
rgb2rgb_template.c	Merge commit '9047491f8bcd87673eed55fb310647a03b0981e9'	2014-01-21 21:55:20 +01:00
rgb2rgb.c	Merge commit '9047491f8bcd87673eed55fb310647a03b0981e9'	2014-01-21 21:55:20 +01:00
rgb2rgb.h	swscale: add nv12/nv21->yuv420 converter	2014-01-21 17:55:07 +01:00
swscale_internal.h	Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30'	2014-03-17 14:41:13 +01:00
swscale_unscaled.c	libswscale: bayer to rgb24 & yv12 colorspace converters	2014-02-23 02:38:22 +01:00
swscale-test.c
swscale.c	swscale: fix rgb48Toxyz12() endianness	2014-01-10 17:26:39 +01:00
swscale.h
swscaleres.rc
utils.c	RGBA64 pixel formats	2014-03-16 23:05:47 +01:00
version.h
yuv2rgb.c	Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'	2014-03-13 22:35:47 +01:00