[MPlayer-cvslog] r27232 - in trunk: etc/codecs.conf libmpdemux/mp_taglists.c

[diego]

Author: diego
Date: Mon Jul  7 14:17:46 2008
New Revision: 27232

Log:
Add support for MLP audio through FFmpeg.


Modified:
   trunk/etc/codecs.conf
   trunk/libmpdemux/mp_taglists.c

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	(original)
+++ trunk/etc/codecs.conf	Mon Jul  7 14:17:46 2008
@@ -2912,6 +2912,13 @@ audiocodec ffape
   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

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	(original)
+++ trunk/libmpdemux/mp_taglists.c	Mon Jul  7 14:17:46 2008
@@ -32,6 +32,7 @@ static const AVCodecTag mp_wav_tags[] = 
     { 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')},