Index: libavcodec/allcodecs.c
===================================================================
--- libavcodec/allcodecs.c	(revision 11448)
+++ libavcodec/allcodecs.c	(working copy)
@@ -184,6 +184,7 @@
     REGISTER_DECODER (IMC, imc);
     REGISTER_DECODER (MACE3, mace3);
     REGISTER_DECODER (MACE6, mace6);
+    REGISTER_DECODER (MLP, mlp);
     REGISTER_ENCDEC  (MP2, mp2);
     REGISTER_DECODER (MP3, mp3);
     REGISTER_DECODER (MP3ADU, mp3adu);
Index: libavcodec/Makefile
===================================================================
--- libavcodec/Makefile	(revision 11448)
+++ libavcodec/Makefile	(working copy)
@@ -109,6 +109,7 @@
 OBJS-$(CONFIG_MJPEG_DECODER)           += mjpegdec.o mjpeg.o
 OBJS-$(CONFIG_MJPEG_ENCODER)           += mjpegenc.o mjpeg.o mpegvideo_enc.o motion_est.o ratecontrol.o
 OBJS-$(CONFIG_MJPEGB_DECODER)          += mjpegbdec.o mjpegdec.o mjpeg.o
+OBJS-$(CONFIG_MLP_DECODER)             += mlpdec.o
 OBJS-$(CONFIG_MMVIDEO_DECODER)         += mmvideo.o
 OBJS-$(CONFIG_MP2_DECODER)             += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
 OBJS-$(CONFIG_MP2_ENCODER)             += mpegaudioenc.o mpegaudio.o mpegaudiodata.o
Index: configure
===================================================================
--- configure	(revision 11448)
+++ configure	(working copy)
@@ -781,6 +781,7 @@
 h263_decoder_deps="h263_parser mpeg4video_parser"
 h263i_decoder_deps="h263_decoder"
 h264_decoder_deps="h264_parser"
+mlp_decoder_deps="mlp_parser"
 mpeg_xvmc_decoder_deps="xvmc"
 mpeg4_decoder_deps="h263_decoder"
 msmpeg4v1_decoder_deps="h263_decoder"
Index: Changelog
===================================================================
--- Changelog	(revision 11448)
+++ Changelog	(working copy)
@@ -108,6 +108,7 @@
 - PC Paintbrush PCX decoder
 - Sun Rasterfile decoder
 - TechnoTrend PVA demuxer
+- MLP/TrueHD decoder
 
 version 0.4.9-pre1:
 
Index: libavcodec/mlpdec.c
===================================================================
--- libavcodec/mlpdec.c	(revision 0)
+++ libavcodec/mlpdec.c	(revision 0)
@@ -0,0 +1,1105 @@
+/*