Mercurial > mplayer.hg

changeset 24764:fbf46414bb48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add nellymoser codec to mplayer with internal fourcc NELL
author compn
date Tue, 16 Oct 2007 13:06:35 +0000
parents 5d7f6e5e0847
children 20f5dea5f233
files etc/codecs.conf libmpdemux/demux_lavf.c
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Tue Oct 16 01:53:34 2007 +0000
+++ b/etc/codecs.conf	Tue Oct 16 13:06:35 2007 +0000
@@ -2747,6 +2747,13 @@
   driver ffmpeg
   dll "ape"
 
+audiocodec ffnellymoser
+  info "FFmpeg Nellymoser Audio decoder"
+  status working
+  fourcc "NELL" ; internal MPlayer FourCC
+  driver ffmpeg
+  dll "nellymoser"
+
 audiocodec pcm
   info "Uncompressed PCM"
   status working
--- a/libmpdemux/demux_lavf.c	Tue Oct 16 01:53:34 2007 +0000
+++ b/libmpdemux/demux_lavf.c	Tue Oct 16 13:06:35 2007 +0000
@@ -86,6 +86,7 @@
     { CODEC_ID_DSICINAUDIO,       MKTAG('D', 'C', 'I', 'A')},
     { CODEC_ID_INTERPLAY_DPCM,    MKTAG('I', 'N', 'P', 'A')},
     { CODEC_ID_MUSEPACK7,         MKTAG('M', 'P', 'C', ' ')},
+    { CODEC_ID_NELLYMOSER,        MKTAG('N', 'E', 'L', 'L')},    
     { CODEC_ID_PCM_S24BE,         MKTAG('i', 'n', '2', '4')},
     { CODEC_ID_PCM_S16BE,         MKTAG('t', 'w', 'o', 's')},
     { CODEC_ID_PCM_S8,            MKTAG('t', 'w', 'o', 's')},