diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2009-03-03 22:51:30 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2009-03-03 22:51:30 +0000 |
commit | 6d4f53cbacbec4fc83f4f84d109c7c68abeecf4a (patch) | |
tree | 7fb4c6eab6fc1863929b9422824f261d0af6784a /Makefile | |
parent | 1ad1eaadd6be407d5ca78ad9d50028031ca37e65 (diff) | |
download | ffmpeg-6d4f53cbacbec4fc83f4f84d109c7c68abeecf4a.tar.gz |
Remove old scaler.
Originally committed as revision 17786 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 12 |
1 files changed, 1 insertions, 11 deletions
@@ -20,9 +20,8 @@ ALLMANPAGES = $(addsuffix .1, $(BASENAMES)) FFLIBS-$(CONFIG_AVFILTER) += avfilter FFLIBS-$(CONFIG_POSTPROC) += postproc -FFLIBS-$(CONFIG_SWSCALE) += swscale -FFLIBS := avdevice avformat avcodec avutil +FFLIBS := avdevice avformat avcodec avutil swscale DATA_FILES := $(wildcard $(SRC_DIR)/ffpresets/*.ffpreset) @@ -236,15 +235,6 @@ LAVF_REG = tests/data/lavf.regression ROTOZOOM_REG = tests/data/rotozoom.regression VSYNTH_REG = tests/data/vsynth.regression -ifneq ($(CONFIG_SWSCALE),yes) -servertest codectest $(CODEC_TESTS) libavtest: swscale-error -swscale-error: - @echo - @echo "This regression test requires --enable-swscale." - @echo - @exit 1 -endif - ifneq ($(CONFIG_ZLIB),yes) regtest-flashsv codectest: zlib-error endif |