diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-11-17 22:51:59 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-11-17 22:51:59 +0000 |
| commit | 40b509b36bf98a9fa382675f47d96a4e89c1597b (patch) | |
| tree | d6624205baa3e49d601335aebb5e74feb8004611 | |
| parent | 767d3e7bf7385f028a09096e86464da89b84a5df (diff) | |
| download | ffmpeg-40b509b36bf98a9fa382675f47d96a4e89c1597b.tar.gz | |
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
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | libavcodec/Makefile | 5 |
2 files changed, 4 insertions, 4 deletions
@@ -872,6 +872,7 @@ HAVE_LIST=" # options emitted with CONFIG_ prefix but not available on command line CONFIG_EXTRA=" fft_mmx + oldscaler " CMDLINE_SELECT=" @@ -928,6 +929,7 @@ vis_deps="sparc" # common features fft_suggest="fft_mmx" fft_mmx_deps="mmx yasm" +oldscaler_deps="!swscale" # decoders / encoders aac_decoder_select="fft mdct" @@ -1084,6 +1086,7 @@ enable ffserver enable ipv6 enable mpegaudio_hp enable network +enable oldscaler enable optimizations enable protocols enable static 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 \ |