From 3e3c638e690df315d89b11fd2f84f979137b5e55 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 13 Sep 2008 03:49:54 +0000 Subject: Switch regression tests to swscale. Plain C, x86-32 and -64 have been tested and should work, other archs that had asm optmizations in swscale likely will need some fixes to either fall back on C if SWS_BITEXACT is set or make the asm match C. This also disables the PAL8 test as neither swscale nor the old scaler really support PAL8 output, imgconvert supported a fixed 666 palette as output and swscale supports fixed 884 and 422. Originally committed as revision 15305 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c65bce8a99..f8caf7735a 100644 --- a/Makefile +++ b/Makefile @@ -263,11 +263,11 @@ LAVF_REG = tests/data/lavf.regression ROTOZOOM_REG = tests/data/rotozoom.regression VSYNTH_REG = tests/data/vsynth.regression -ifeq ($(CONFIG_SWSCALE),yes) +ifneq ($(CONFIG_SWSCALE),yes) servertest codectest $(CODEC_TESTS) libavtest: swscale_error swscale_error: @echo - @echo "This regression test is incompatible with --enable-swscale." + @echo "This regression test requires --enable-swscale." @echo @exit 1 endif -- cgit v1.2.3