4c8bc6fdee
* commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5': avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8 Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/raw.c libavutil/pixdesc.c libavutil/pixfmt.h libavutil/version.h libswscale/swscale_internal.h libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
---|---|---|
.. | ||
hscale_fast_bilinear_simd.c | ||
input.asm | ||
Makefile | ||
output.asm | ||
rgb2rgb_template.c | ||
rgb2rgb.c | ||
scale.asm | ||
swscale_template.c | ||
swscale.c | ||
w64xmmtest.c | ||
yuv2rgb_template.c | ||
yuv2rgb.c |