Bail out immediately with software scaler instead of failing the tests.

Originally committed as revision 7438 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/tests/Makefile b/tests/Makefile
index 9c65bc5..18a5157 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -37,6 +37,15 @@ libavtest:
        @echo
 endif
 
+ifeq ($(CONFIG_SWSCALER),yes)
+test-server codectest mpeg4 mpeg ac3 snow snowll libavtest: swscale_error
+swscale_error:
+       @echo
+       @echo "This regression test is incompatible with --enable-swscaler."
+       @echo
+       @exit 1
+endif
+
 # video generation
 
 vsynth1/00.pgm: videogen$(EXESUF)