summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2014-02-27 15:02:24 -0800
committerDiego Biurrun <diego@biurrun.de>2014-02-28 21:11:53 +0100
commit34150be515cd9c43b0b679806b8d01774960af78 (patch)
treecba3c89e9d30fd805734734e5f2b75b827c3027e
parent8e0cf39faf02536dca08f4fe628a66d1ae022fde (diff)
downloadffmpeg-streaming-34150be515cd9c43b0b679806b8d01774960af78.zip
ffmpeg-streaming-34150be515cd9c43b0b679806b8d01774960af78.tar.gz
build: Let the iac decoder depend on the imc decoder
Almost all of the code is shared so there is little point in enabling one decoder without the other.
-rwxr-xr-xconfigure2
-rw-r--r--libavcodec/Makefile1
2 files changed, 1 insertions, 2 deletions
diff --git a/configure b/configure
index bb4172a..93d43ea 100755
--- a/configure
+++ b/configure
@@ -1694,7 +1694,7 @@ h264_decoder_suggest="error_resilience"
hevc_decoder_select="dsputil golomb videodsp"
huffyuv_decoder_select="dsputil"
huffyuv_encoder_select="dsputil huffman"
-iac_decoder_select="dsputil fft mdct sinewin"
+iac_decoder_select="imc_decoder"
imc_decoder_select="dsputil fft mdct sinewin"
indeo3_decoder_select="hpeldsp"
interplay_video_decoder_select="hpeldsp"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 04f61ee..1bd4ace 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -204,7 +204,6 @@ OBJS-$(CONFIG_HEVC_DECODER) += hevc.o hevc_mvs.o hevc_ps.o hevc_sei.o
OBJS-$(CONFIG_HNM4_VIDEO_DECODER) += hnm4video.o
OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o huffyuvdec.o
OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o huffyuvenc.o
-OBJS-$(CONFIG_IAC_DECODER) += imc.o
OBJS-$(CONFIG_IDCIN_DECODER) += idcinvideo.o
OBJS-$(CONFIG_IFF_BYTERUN1_DECODER) += iff.o
OBJS-$(CONFIG_IFF_ILBM_DECODER) += iff.o
OpenPOWER on IntegriCloud