Merge commit 'bd499d9af668aef979ec9f3f3215b8dd508c7ec1'

* commit 'bd499d9af668aef979ec9f3f3215b8dd508c7ec1':
  build: Conditionally build and test iirfilter

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>

3 files changed, 9 insertions, 7 deletions

diff --git a/configure b/configure
index 742dfe1091..bde30c6b8d 100755
--- a/configure
+++ b/configure
@@ -1821,6 +1821,7 @@ CONFIG_EXTRA="
     huffyuvdsp
     huffyuvencdsp
     idctdsp
+    iirfilter
     intrax8
     lgplv3
     llauddsp
@@ -2016,7 +2017,7 @@ mpegvideoenc_select="me_cmp mpegvideo pixblockdsp qpeldsp"
 
 # decoders / encoders
 aac_decoder_select="mdct sinewin"
-aac_encoder_select="audio_frame_queue mdct sinewin"
+aac_encoder_select="audio_frame_queue iirfilter mdct sinewin"
 aac_latm_decoder_select="aac_decoder aac_latm_parser"
 ac3_decoder_select="ac3_parser ac3dsp bswapdsp mdct"
 ac3_fixed_decoder_select="ac3_parser ac3dsp bswapdsp mdct"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 634cebcde0..32e4411ff1 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -62,6 +62,7 @@ OBJS-$(CONFIG_HUFFYUVDSP)              += huffyuvdsp.o
 OBJS-$(CONFIG_HUFFYUVENCDSP)           += huffyuvencdsp.o
 OBJS-$(CONFIG_IDCTDSP)                 += idctdsp.o faanidct.o          \
                                           simple_idct.o jrevdct.o
+OBJS-$(CONFIG_IIRFILTER)               += iirfilter.o
 OBJS-$(CONFIG_INTRAX8)                 += intrax8.o intrax8dsp.o
 OBJS-$(CONFIG_LIBXVID)                 += libxvid_rc.o
 OBJS-$(CONFIG_LLAUDDSP)                += lossless_audiodsp.o
@@ -105,8 +106,7 @@ OBJS-$(CONFIG_AAC_DECODER)             += aacdec.o aactab.o aacsbr.o aacps.o \
                                           sbrdsp.o aacpsdsp.o
 OBJS-$(CONFIG_AAC_ENCODER)             += aacenc.o aaccoder.o    \
                                           aacpsy.o aactab.o      \
-                                          psymodel.o iirfilter.o \
-                                          mpeg4audio.o kbdwin.o
+                                          psymodel.o mpeg4audio.o kbdwin.o
 OBJS-$(CONFIG_AASC_DECODER)            += aasc.o msrledec.o
 OBJS-$(CONFIG_AC3_DECODER)             += ac3dec_float.o ac3dec_data.o ac3.o kbdwin.o
 OBJS-$(CONFIG_AC3_FIXED_DECODER)       += ac3dec_fixed.o ac3dec_data.o ac3.o kbdwin.o
@@ -856,13 +856,14 @@ TESTPROGS = cabac                                                       \
             fft-fixed                                                   \
             fft-fixed32                                                 \
             golomb                                                      \
-            iirfilter                                                   \
             imgconvert                                                  \
             rangecoder                                                  \
             snowenc                                                     \
 
-TESTPROGS-$(CONFIG_DCT) += dct
-TESTPROGS-$(HAVE_MMX) += motion
+TESTPROGS-$(CONFIG_DCT)                   += dct
+TESTPROGS-$(CONFIG_IIRFILTER)             += iirfilter
+TESTPROGS-$(HAVE_MMX)                     += motion
+
 TESTOBJS = dctref.o
 
 TOOLS = fourcc2pixfmt
diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak
index b5fa4f06db..f22802d429 100644
--- a/tests/fate/libavcodec.mak
+++ b/tests/fate/libavcodec.mak
@@ -9,7 +9,7 @@ fate-idct8x8: CMD = run libavcodec/dct-test -i
 fate-idct8x8: CMP = null
 fate-idct8x8: REF = /dev/null
 
-FATE_LIBAVCODEC-yes += fate-iirfilter
+FATE_LIBAVCODEC-$(CONFIG_IIRFILTER) += fate-iirfilter
 fate-iirfilter: libavcodec/iirfilter-test$(EXESUF)
 fate-iirfilter: CMD = run libavcodec/iirfilter-test