ffmpeg/libswscale
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
..
bfin
ppc Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' 2012-12-21 17:32:52 +01:00
sparc
x86 Merge commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b' 2013-01-19 13:01:06 +01:00
Makefile
colorspace-test.c
input.c sws: add planar RGB formats to isAnyRGB 2013-01-26 20:40:44 +01:00
libswscale.v
options.c sws: add AVOption flag for error diffusion dither 2013-01-19 02:38:48 +01:00
output.c Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2' 2013-01-28 14:11:31 +01:00
rgb2rgb.c
rgb2rgb.h
rgb2rgb_template.c
swscale-test.c libswscale/swscale-test: fix some const correctness 2012-12-26 03:14:59 +01:00
swscale.c swscale: GBRP output support 2013-01-27 15:28:07 -05:00
swscale.h sws: Fix error diffusion flag 2013-01-19 23:13:40 +01:00
swscale_internal.h Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2' 2013-01-28 14:11:31 +01:00
swscale_unscaled.c sws: use planarRgbToRgbWrapper only for 8bit per component 2013-01-26 20:40:44 +01:00
utils.c Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2' 2013-01-28 14:11:31 +01:00
version.h sws: Fix error diffusion flag 2013-01-19 23:13:40 +01:00
yuv2rgb.c sws: disable yuv2rgb warning for planar rgb. 2013-01-26 23:09:58 +01:00