aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2007-07-13 17:41:28 +0000
committerMåns Rullgård <mans@mansr.com>2007-07-13 17:41:28 +0000
commitfdc1973e30b5ccafaa2443053fd65a35fdbd9d5a (patch)
tree3ca150521b2430226dd874ca0bde937ff4e2a6e8
parent40b78d532627f2293e6e225760e69bc987036503 (diff)
downloadffmpeg-fdc1973e30b5ccafaa2443053fd65a35fdbd9d5a.tar.gz
libavtest and seektest no longer need gpl
Originally committed as revision 9633 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Makefile8
1 files changed, 0 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index e90d0fcb8c..caeb56e62e 100644
--- a/Makefile
+++ b/Makefile
@@ -275,18 +275,10 @@ codectest mpeg4 mpeg ac3 snow snowll: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests
$(SRC_PATH)/tests/regression.sh $@ $(FFMPEG_REFFILE) tests/vsynth1
$(SRC_PATH)/tests/regression.sh $@ $(ROTOZOOM_REFFILE) tests/vsynth2
-ifeq ($(CONFIG_GPL),yes)
libavtest: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw
$(SRC_PATH)/tests/regression.sh $@ $(LIBAV_REFFILE) tests/vsynth1
seektest: tests/seek_test$(EXESUF)
$(SRC_PATH)/tests/seek_test.sh $(SEEK_REFFILE)
-else
-libavtest seektest:
- @echo
- @echo "This test requires FFmpeg to be compiled with --enable-gpl."
- @echo
- @exit 1
-endif
ifeq ($(CONFIG_SWSCALER),yes)
test-server codectest mpeg4 mpeg ac3 snow snowll libavtest: swscale_error