Merge commit 'bd499d9af668aef979ec9f3f3215b8dd508c7ec1'

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

Conflicts:
	libavcodec/Makefile

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

diff --cc configure
index 742dfe10913c21ddbba202c5f9c149bfd2228a3a,26e1e822c026c5beee2604e24298f91d4f8995b4..bde30c6b8d3f49657056916e4d7c28d4d0a9f172
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1821,10 -1548,9 +1821,11 @@@ CONFIG_EXTRA=
      huffyuvdsp
      huffyuvencdsp
      idctdsp
+     iirfilter
      intrax8
      lgplv3
 +    llauddsp
 +    llviddsp
      lpc
      me_cmp
      mpeg_er
@@@ -2016,10 -1721,9 +2017,10 @@@ mpegvideoenc_select="me_cmp mpegvideo p
  
  # 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"
  ac3_encoder_select="ac3dsp audiodsp mdct me_cmp"
  ac3_fixed_encoder_select="ac3dsp audiodsp mdct me_cmp"
  aic_decoder_select="golomb idctdsp"

diff --cc libavcodec/Makefile
index 634cebcde02e0369001208cd9203bd5a49e6cb1f,684269c00dacff9aa5692d744461d16a700797e2..32e4411ff16fbe1c9ce97abda7dfa32ef7e57e0d
--- 1/libavcodec/Makefile
--- 2/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -62,13 -54,12 +62,14 @@@ OBJS-$(CONFIG_HUFFYUVDSP)              
  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
 +OBJS-$(CONFIG_LLVIDDSP)                += lossless_videodsp.o
  OBJS-$(CONFIG_LPC)                     += lpc.o
  OBJS-$(CONFIG_LSP)                     += lsp.o
 -OBJS-$(CONFIG_MDCT)                    += mdct_fixed.o mdct_float.o
 +OBJS-$(CONFIG_MDCT)                    += mdct_fixed.o mdct_float.o mdct_fixed_32.o
  OBJS-$(CONFIG_ME_CMP)                  += me_cmp.o
  OBJS-$(CONFIG_MPEG_ER)                 += mpeg_er.o
  OBJS-$(CONFIG_MPEGAUDIO)               += mpegaudio.o mpegaudiodata.o   \
@@@ -105,11 -94,9 +106,10 @@@ OBJS-$(CONFIG_AAC_DECODER)             
                                            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.o ac3dec_data.o ac3.o kbdwin.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
  OBJS-$(CONFIG_AC3_ENCODER)             += ac3enc_float.o ac3enc.o ac3tab.o \
                                            ac3.o kbdwin.o
  OBJS-$(CONFIG_AC3_FIXED_ENCODER)       += ac3enc_fixed.o ac3enc.o ac3tab.o ac3.o
@@@ -851,22 -711,16 +851,23 @@@ SKIPHEADERS-$(CONFIG_VAAPI)            
  SKIPHEADERS-$(CONFIG_VDA)              += vda.h vda_internal.h
  SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h vdpau_internal.h
  
 -TESTPROGS = dct                                                         \
 +TESTPROGS = cabac                                                       \
              fft                                                         \
              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
 +
  HOSTPROGS = aac_tablegen                                                \
              aacps_tablegen                                              \
              cbrt_tablegen                                               \

diff --cc tests/fate/libavcodec.mak
Simple merge