diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 21:51:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 21:51:19 +0200 |
| commit | ccd3edf81fc2f5a70f1218ce0b3595481bfec0e6 (patch) | |
| tree | 7445749ff5fecb320a0e4ff27d7b35cee6d9033f | |
| parent | 948a15195c69da2ff9a4b0ac7df782ba1cc2795f (diff) | |
| parent | 2edc77dc7be5f4a006c6295f4c827e5471f85262 (diff) | |
| download | ffmpeg-ccd3edf81fc2f5a70f1218ce0b3595481bfec0e6.tar.gz | |
Merge commit '2edc77dc7be5f4a006c6295f4c827e5471f85262'
* commit '2edc77dc7be5f4a006c6295f4c827e5471f85262':
configure: Factor out ividsp module
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | libavcodec/Makefile | 5 |
2 files changed, 6 insertions, 2 deletions
@@ -1920,6 +1920,7 @@ CONFIG_EXTRA=" iirfilter imdct15 intrax8 + ividsp jpegtables libx262 lgplv3 @@ -2226,6 +2227,8 @@ huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp llviddsp" iac_decoder_select="imc_decoder" imc_decoder_select="bswapdsp fft mdct sinewin" indeo3_decoder_select="hpeldsp" +indeo4_decoder_select="ividsp" +indeo5_decoder_select="ividsp" interplay_video_decoder_select="hpeldsp" jpegls_decoder_select="golomb mjpeg_decoder" jpegls_encoder_select="golomb" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 8aa23e6b1e..2546fb0d98 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -72,6 +72,7 @@ OBJS-$(CONFIG_IDCTDSP) += idctdsp.o simple_idct.o jrevdct.o OBJS-$(CONFIG_IIRFILTER) += iirfilter.o OBJS-$(CONFIG_IMDCT15) += imdct15.o OBJS-$(CONFIG_INTRAX8) += intrax8.o intrax8dsp.o +OBJS-$(CONFIG_IVIDSP) += ivi_dsp.o OBJS-$(CONFIG_JPEGTABLES) += jpegtables.o OBJS-$(CONFIG_LIBXVID) += libxvid_rc.o OBJS-$(CONFIG_LLAUDDSP) += lossless_audiodsp.o @@ -303,8 +304,8 @@ OBJS-$(CONFIG_IFF_ILBM_DECODER) += iff.o OBJS-$(CONFIG_IMC_DECODER) += imc.o OBJS-$(CONFIG_INDEO2_DECODER) += indeo2.o OBJS-$(CONFIG_INDEO3_DECODER) += indeo3.o -OBJS-$(CONFIG_INDEO4_DECODER) += indeo4.o ivi.o ivi_dsp.o -OBJS-$(CONFIG_INDEO5_DECODER) += indeo5.o ivi.o ivi_dsp.o +OBJS-$(CONFIG_INDEO4_DECODER) += indeo4.o ivi.o +OBJS-$(CONFIG_INDEO5_DECODER) += indeo5.o ivi.o OBJS-$(CONFIG_INTERPLAY_DPCM_DECODER) += dpcm.o OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o OBJS-$(CONFIG_JACOSUB_DECODER) += jacosubdec.o ass.o |