summaryrefslogtreecommitdiff
path: root/libavcodec/Makefile
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2008-11-17 22:51:59 +0000
committerDiego Biurrun <diego@biurrun.de>2008-11-17 22:51:59 +0000
commit40b509b36bf98a9fa382675f47d96a4e89c1597b (patch)
treed6624205baa3e49d601335aebb5e74feb8004611 /libavcodec/Makefile
parent767d3e7bf7385f028a09096e86464da89b84a5df (diff)
Add a Makefile variable for the old scaler that gets enabled when the new
scaler is disabled to get rid of a Makefile ifdef. Originally committed as revision 15867 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r--libavcodec/Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 375d24d1cb..fe33a5f0ab 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -27,6 +27,7 @@ OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o
OBJS-$(CONFIG_FFT) += fft.o
OBJS-$(CONFIG_GOLOMB) += golomb.o
OBJS-$(CONFIG_MDCT) += mdct.o
+OBJS-$(CONFIG_OLDSCALER) += imgresample.o
OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o
OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.o
@@ -383,10 +384,6 @@ OBJS-$(HAVE_W32THREADS) += w32thread.o
OBJS-$(HAVE_XVMC) += xvmcvideo.o
-ifndef CONFIG_SWSCALE
-OBJS += imgresample.o
-endif
-
# processor-specific code
ifdef HAVE_MMX
OBJS += i386/fdct_mmx.o \