# HG changeset patch
# User compn
# Date 1192539995 0
# Node ID fbf46414bb48ee81b143b0e600c15ad9542e578b
# Parent  5d7f6e5e08472a94158a4a74c01a776dbb969cc9
add nellymoser codec to mplayer with internal fourcc NELL

diff -r 5d7f6e5e0847 -r fbf46414bb48 etc/codecs.conf
--- 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
diff -r 5d7f6e5e0847 -r fbf46414bb48 libmpdemux/demux_lavf.c
--- 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')},