diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-01-14 18:24:02 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-01-15 15:23:46 +0100 |
| commit | dc4d726bab59f349d366916ba01df16289e5c81f (patch) | |
| tree | 0a27068eecea3bbd511a0ce71065e2f55877cd59 | |
| parent | fe96769bed828cf54c0d9dc5d55b74948a68946d (diff) | |
| download | ffmpeg-dc4d726bab59f349d366916ba01df16289e5c81f.tar.gz | |
build: Add separate hidden config option for the intrax8 code
This allows for slightly cleaner dependency specification.
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | libavcodec/Makefile | 7 |
2 files changed, 6 insertions, 6 deletions
@@ -1455,6 +1455,7 @@ CONFIG_EXTRA=" h264qpel hpeldsp huffman + intrax8 lgplv3 lpc mpegaudio @@ -1764,7 +1765,7 @@ twinvq_decoder_select="mdct lsp sinewin" utvideo_decoder_select="dsputil" utvideo_encoder_select="dsputil huffman" vble_decoder_select="dsputil" -vc1_decoder_select="error_resilience h263_decoder h264chroma h264qpel" +vc1_decoder_select="error_resilience h263_decoder h264chroma h264qpel intrax8" vc1image_decoder_select="vc1_decoder" vorbis_decoder_select="mdct" vorbis_encoder_select="mdct" @@ -1784,7 +1785,7 @@ wmav2_encoder_select="mdct sinewin" wmavoice_decoder_select="lsp rdft dct mdct sinewin" wmv1_decoder_select="h263_decoder" wmv1_encoder_select="h263_encoder" -wmv2_decoder_select="h263_decoder videodsp" +wmv2_decoder_select="h263_decoder intrax8 videodsp" wmv2_encoder_select="h263_encoder" wmv3_decoder_select="vc1_decoder" wmv3image_decoder_select="wmv3_decoder" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 7a978bb47e..75426c49f4 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -46,6 +46,7 @@ OBJS-$(CONFIG_H264PRED) += h264pred.o OBJS-$(CONFIG_H264QPEL) += h264qpel.o OBJS-$(CONFIG_HPELDSP) += hpeldsp.o OBJS-$(CONFIG_HUFFMAN) += huffman.o +OBJS-$(CONFIG_INTRAX8) += intrax8.o intrax8dsp.o OBJS-$(CONFIG_LIBXVID) += libxvid_rc.o OBJS-$(CONFIG_LPC) += lpc.o OBJS-$(CONFIG_LSP) += lsp.o @@ -376,8 +377,7 @@ OBJS-$(CONFIG_V210X_DECODER) += v210x.o OBJS-$(CONFIG_VB_DECODER) += vb.o OBJS-$(CONFIG_VBLE_DECODER) += vble.o OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1.o vc1data.o vc1dsp.o \ - msmpeg4dec.o msmpeg4.o msmpeg4data.o \ - intrax8.o intrax8dsp.o + msmpeg4dec.o msmpeg4.o msmpeg4data.o OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdav.o OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdav.o @@ -408,8 +408,7 @@ OBJS-$(CONFIG_WMAVOICE_DECODER) += wmavoice.o \ acelp_vectors.o acelp_filters.o OBJS-$(CONFIG_WMV1_DECODER) += msmpeg4dec.o msmpeg4.o msmpeg4data.o OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o wmv2dsp.o \ - msmpeg4dec.o msmpeg4.o msmpeg4data.o \ - intrax8.o intrax8dsp.o + msmpeg4dec.o msmpeg4.o msmpeg4data.o OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o wmv2dsp.o \ msmpeg4.o msmpeg4enc.o msmpeg4data.o OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o |