From 40b509b36bf98a9fa382675f47d96a4e89c1597b Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Mon, 17 Nov 2008 22:51:59 +0000
Subject: [PATCH] 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
---
configure | 3 +++
libavcodec/Makefile | 5 +----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index b6ca3796037..5cf1ef6515f 100755
--- a/configure
+++ b/configure
@@ -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 375d24d1cb5..fe33a5f0abf 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 \
--
GitLab