Enable the TrueHD decoder when the MLP decoder is enabled.

They share all code, there is no point in enabling one but not the other.

Originally committed as revision 20965 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index 25e4f2ceab4da462390d100c454514341a07f0e6..52828e95b438005aa85b0e34e800f24760c368f2 100755 (executable)
--- a/configure
+++ b/configure
@@ -1165,6 +1165,7 @@ svq3_decoder_suggest="zlib"
 theora_decoder_select="vp3_decoder"
 tiff_decoder_suggest="zlib"
 tiff_encoder_suggest="zlib"
+truehd_decoder_select="mlp_decoder"
 tscc_decoder_select="zlib"
 vc1_decoder_select="h263_decoder"
 vc1_vaapi_hwaccel_deps="va_va_h"

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index d2d18254f3945c4ef73ac27c94da16508c707268..f9b6e9ac2cad46869128e4f442deb8495e4c9b25 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -290,7 +290,6 @@ OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o
 OBJS-$(CONFIG_TIFF_DECODER)            += tiff.o lzw.o faxcompr.o
 OBJS-$(CONFIG_TIFF_ENCODER)            += tiffenc.o rle.o lzwenc.o
 OBJS-$(CONFIG_TMV_DECODER)             += tmv.o cga_data.o
-OBJS-$(CONFIG_TRUEHD_DECODER)          += mlpdec.o mlp_parser.o mlp.o mlpdsp.o
 OBJS-$(CONFIG_TRUEMOTION1_DECODER)     += truemotion1.o
 OBJS-$(CONFIG_TRUEMOTION2_DECODER)     += truemotion2.o
 OBJS-$(CONFIG_TRUESPEECH_DECODER)      += truespeech.o