Michael Niedermayer e827f65618 Merge commit '33c827f632f95ffe3399b695a5a0d47b366b6e20' ... * commit '33c827f632f95ffe3399b695a5a0d47b366b6e20': swscale: Properly scale YUV Conflicts: libswscale/swscale_unscaled.c tests/ref/fate/filter-pixdesc-yuv420p10be tests/ref/fate/filter-pixdesc-yuv420p10le tests/ref/fate/filter-pixdesc-yuv420p9be tests/ref/fate/filter-pixdesc-yuv420p9le tests/ref/fate/filter-pixdesc-yuva420p10be tests/ref/fate/filter-pixdesc-yuva420p10le tests/ref/fate/filter-pixdesc-yuva420p9be tests/ref/fate/filter-pixdesc-yuva420p9le tests/ref/fate/filter-pixfmts-copy tests/ref/fate/filter-pixfmts-null tests/ref/fate/filter-pixfmts-scale tests/ref/fate/filter-pixfmts-vflip See: abe0b8e9f3 Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-12-06 01:30:08 +01:00
..
arm
ppc
x86	swscale/x86/rgb2rgb_template: fix crash with tiny size and nv12 output	2014-12-03 20:21:56 +01:00
bayer_template.c
colorspace-test.c
hscale_fast_bilinear.c
input.c
libswscale.v
log2_tab.c
Makefile
options.c
output.c
rgb2rgb_template.c
rgb2rgb.c
rgb2rgb.h
swscale_internal.h
swscale_unscaled.c	Merge commit '33c827f632f95ffe3399b695a5a0d47b366b6e20'	2014-12-06 01:30:08 +01:00
swscale-test.c
swscale.c
swscale.h
swscaleres.rc
utils.c
version.h
yuv2rgb.c