Michael Niedermayer 3141b04c7f Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87' ... * commit 'da785231ea0b82b5c2526babbb2871c935b21a87': bfin: Refactor duplicated assembly-related macros Conflicts: libavcodec/bfin/hpel_pixels_bfin.S Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-03-14 01:56:25 +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	Merge remote-tracking branch 'qatar/master'	2014-01-21 22:20:26 +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 'b4dd424d96f09f9bafb88e47f37df65dc4529143'	2014-03-13 22:35:47 +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	libswscale: bayer to rgb24 & yv12 colorspace converters	2014-02-23 02:38:22 +01:00
version.h	Merge commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0'	2013-12-27 12:01:23 +01:00
yuv2rgb.c	Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'	2014-03-13 22:35:47 +01:00