From aec09a004c15101318b61f3fd494d32261fd8829 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 29 Dec 2009 13:48:48 +0000 Subject: [PATCH] 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 --- configure | 1 + libavcodec/Makefile | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 25e4f2ceab..52828e95b4 100755 --- 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 d2d18254f3..f9b6e9ac2c 100644 --- 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 -- GitLab