virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

build: Conditionally build and test iirfilter

Browse Source
This commit is contained in:
Diego Biurrun 2014-07-21 05:26:00 -07:00
parent c3ec963d0d
commit bd499d9af6
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -1548,6 +1548,7 @@ CONFIG_EXTRA="
huffyuvdsp huffyuvdsp
huffyuvencdsp huffyuvencdsp
idctdsp idctdsp
iirfilter
intrax8 intrax8
lgplv3 lgplv3
lpc lpc
@ -1720,7 +1721,7 @@ mpegvideoenc_select="me_cmp mpegvideo pixblockdsp qpeldsp"
# decoders / encoders # decoders / encoders
aac_decoder_select="mdct sinewin" 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" aac_latm_decoder_select="aac_decoder aac_latm_parser"
ac3_decoder_select="ac3_parser ac3dsp bswapdsp mdct" ac3_decoder_select="ac3_parser ac3dsp bswapdsp mdct"
ac3_encoder_select="ac3dsp audiodsp mdct me_cmp" ac3_encoder_select="ac3dsp audiodsp mdct me_cmp"

7
libavcodec/Makefile
View File

@ -54,6 +54,7 @@ OBJS-$(CONFIG_HUFFYUVDSP) += huffyuvdsp.o
OBJS-$(CONFIG_HUFFYUVENCDSP) += huffyuvencdsp.o OBJS-$(CONFIG_HUFFYUVENCDSP) += huffyuvencdsp.o
OBJS-$(CONFIG_IDCTDSP) += idctdsp.o faanidct.o \ OBJS-$(CONFIG_IDCTDSP) += idctdsp.o faanidct.o \
simple_idct.o jrevdct.o simple_idct.o jrevdct.o
OBJS-$(CONFIG_IIRFILTER) += iirfilter.o
OBJS-$(CONFIG_INTRAX8) += intrax8.o intrax8dsp.o OBJS-$(CONFIG_INTRAX8) += intrax8.o intrax8dsp.o
OBJS-$(CONFIG_LIBXVID) += libxvid_rc.o OBJS-$(CONFIG_LIBXVID) += libxvid_rc.o
OBJS-$(CONFIG_LPC) += lpc.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 sbrdsp.o aacpsdsp.o
OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \ OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \
aacpsy.o aactab.o \ aacpsy.o aactab.o \
psymodel.o iirfilter.o \ psymodel.o mpeg4audio.o kbdwin.o
mpeg4audio.o kbdwin.o
OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.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.o ac3dec_data.o ac3.o kbdwin.o
OBJS-$(CONFIG_AC3_ENCODER) += ac3enc_float.o ac3enc.o ac3tab.o \ OBJS-$(CONFIG_AC3_ENCODER) += ac3enc_float.o ac3enc.o ac3tab.o \
@ -715,9 +715,10 @@ TESTPROGS = dct \
fft \ fft \
fft-fixed \ fft-fixed \
golomb \ golomb \
iirfilter \
rangecoder \ rangecoder \
TESTPROGS-$(CONFIG_IIRFILTER) += iirfilter
TESTOBJS = dctref.o TESTOBJS = dctref.o
HOSTPROGS = aac_tablegen \ HOSTPROGS = aac_tablegen \

2
tests/fate/libavcodec.mak
View File

@ -9,7 +9,7 @@ fate-idct8x8: CMD = run libavcodec/dct-test -i
fate-idct8x8: CMP = null fate-idct8x8: CMP = null
fate-idct8x8: REF = /dev/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: libavcodec/iirfilter-test$(EXESUF)
fate-iirfilter: CMD = run libavcodec/iirfilter-test fate-iirfilter: CMD = run libavcodec/iirfilter-test