# HG changeset patch # User diego # Date 1226962319 0 # Node ID 368413cfe34b19fa15a1fd82bf604689cbeb883d # Parent bc4ddc399192e6e21108ad4ccaef26fa811c374c Add a Makefile variable for the old scaler that gets enabled when the new scaler is disabled to get rid of a Makefile ifdef. diff -r bc4ddc399192 -r 368413cfe34b Makefile --- a/Makefile Mon Nov 17 21:56:34 2008 +0000 +++ b/Makefile Mon Nov 17 22:51:59 2008 +0000 @@ -27,6 +27,7 @@ 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_XVMC) += xvmcvideo.o -ifndef CONFIG_SWSCALE -OBJS += imgresample.o -endif - # processor-specific code ifdef HAVE_MMX OBJS += i386/fdct_mmx.o \