diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-21 21:35:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-21 21:35:02 +0200 |
| commit | 79df91bfc403e97e50f3ba0ed9acabeeb5590cd4 (patch) | |
| tree | 02970fac33073c2792133aabf09efcea797d3710 /libavcodec/Makefile | |
| parent | 94c4ad27dc6305a7e1f218b86311db019e41f632 (diff) | |
| parent | bd499d9af668aef979ec9f3f3215b8dd508c7ec1 (diff) | |
Merge commit 'bd499d9af668aef979ec9f3f3215b8dd508c7ec1'
* commit 'bd499d9af668aef979ec9f3f3215b8dd508c7ec1':
build: Conditionally build and test iirfilter
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
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 |