diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-07-21 05:26:00 -0700 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-07-21 05:32:07 -0700 |
| commit | bd499d9af668aef979ec9f3f3215b8dd508c7ec1 (patch) | |
| tree | fa5ff4c554fc8575f2776e27f86abd7dfb456381 | |
| parent | c3ec963d0d0fac2d817f7fbce2e89ed46eeba550 (diff) | |
build: Conditionally build and test iirfilter
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | libavcodec/Makefile | 7 | ||||
| -rw-r--r-- | tests/fate/libavcodec.mak | 2 |
3 files changed, 7 insertions, 5 deletions
@@ -1548,6 +1548,7 @@ CONFIG_EXTRA=" huffyuvdsp huffyuvencdsp idctdsp + iirfilter intrax8 lgplv3 lpc @@ -1720,7 +1721,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_encoder_select="ac3dsp audiodsp mdct me_cmp" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 75837b2f11..684269c00d 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -54,6 +54,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_LPC) += lpc.o @@ -93,8 +94,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.o ac3dec_data.o ac3.o kbdwin.o OBJS-$(CONFIG_AC3_ENCODER) += ac3enc_float.o ac3enc.o ac3tab.o \ @@ -715,9 +715,10 @@ TESTPROGS = dct \ fft \ fft-fixed \ golomb \ - iirfilter \ rangecoder \ +TESTPROGS-$(CONFIG_IIRFILTER) += iirfilter + TESTOBJS = dctref.o HOSTPROGS = aac_tablegen \ diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak index 6e81f57688..7fecc529f6 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 |