[FFmpeg-cvslog] r20965 - in trunk: configure libavcodec/Makefile

[diego]

Author: diego
Date: Tue Dec 29 14:48:48 2009
New Revision: 20965

Log:
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.

Modified:
   trunk/configure
   trunk/libavcodec/Makefile

Modified: trunk/configure
==============================================================================
--- trunk/configure	Tue Dec 29 14:14:41 2009	(r20964)
+++ trunk/configure	Tue Dec 29 14:48:48 2009	(r20965)
@@ -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"

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	Tue Dec 29 14:14:41 2009	(r20964)
+++ trunk/libavcodec/Makefile	Tue Dec 29 14:48:48 2009	(r20965)
@@ -290,7 +290,6 @@ OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) +
 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