[FFmpeg-cvslog] r15867 - in trunk: configure libavcodec/Makefile
diego
subversion
Mon Nov 17 23:51:59 CET 2008
Author: diego
Date: Mon Nov 17 23:51:59 2008
New Revision: 15867
Log:
Add a Makefile variable for the old scaler that gets enabled when the new
scaler is disabled to get rid of a Makefile ifdef.
Modified:
trunk/configure
trunk/libavcodec/Makefile
Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Mon Nov 17 23:51:59 2008
@@ -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
Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile (original)
+++ trunk/libavcodec/Makefile Mon Nov 17 23:51:59 2008
@@ -27,6 +27,7 @@ OBJS-$(CONFIG_ENCODERS) +
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) +
OBJS-$(HAVE_XVMC) += xvmcvideo.o
-ifndef CONFIG_SWSCALE
-OBJS += imgresample.o
-endif
-
# processor-specific code
ifdef HAVE_MMX
OBJS += i386/fdct_mmx.o \
More information about the ffmpeg-cvslog
mailing list