# HG changeset patch
# User diego
# Date 1215433066 0
# Node ID 4c4c3d7845fcbdf78bd8da9994445dc74edb0471
# Parent  abd0a4e9daa052beabc558d1ba3ef084fc52a806
Add support for MLP audio through FFmpeg.

diff -r abd0a4e9daa0 -r 4c4c3d7845fc etc/codecs.conf
--- a/etc/codecs.conf	Mon Jul 07 09:32:21 2008 +0000
+++ b/etc/codecs.conf	Mon Jul 07 12:17:46 2008 +0000
@@ -2912,6 +2912,13 @@
   driver ffmpeg
   dll "ape"
 
+audiocodec ffmlp
+  info "FFmpeg MLP decoder"
+  status working
+  fourcc "MLP " ; internal MPlayer FourCC
+  driver ffmpeg
+  dll "mlp"
+
 audiocodec ffnellymoser
   info "FFmpeg Nellymoser Audio decoder"
   status working
diff -r abd0a4e9daa0 -r 4c4c3d7845fc libmpdemux/mp_taglists.c
--- a/libmpdemux/mp_taglists.c	Mon Jul 07 09:32:21 2008 +0000
+++ b/libmpdemux/mp_taglists.c	Mon Jul 07 12:17:46 2008 +0000
@@ -32,6 +32,7 @@
     { CODEC_ID_COOK,              MKTAG('c', 'o', 'o', 'k')},
     { CODEC_ID_DSICINAUDIO,       MKTAG('D', 'C', 'I', 'A')},
     { CODEC_ID_INTERPLAY_DPCM,    MKTAG('I', 'N', 'P', 'A')},
+    { CODEC_ID_MLP,               MKTAG('M', 'L', 'P', ' ')},
     { CODEC_ID_MUSEPACK7,         MKTAG('M', 'P', 'C', ' ')},
     { CODEC_ID_MUSEPACK8,         MKTAG('M', 'P', 'C', '8')},
     { CODEC_ID_NELLYMOSER,        MKTAG('N', 'E', 'L', 'L')},