Mercurial > mplayer.hg

changeset 27200:4c4c3d7845fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add support for MLP audio through FFmpeg.
author diego
date Mon, 07 Jul 2008 12:17:46 +0000
parents abd0a4e9daa0
children 46e21b0705c8
files etc/codecs.conf libmpdemux/mp_taglists.c
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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')},