[MPlayer-cvslog] r21378 - in trunk: etc/codecs.conf libmpdemux/demux_lavf.c

[diego]

Author: diego
Date: Wed Nov 29 11:51:39 2006
New Revision: 21378

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

Log:
support for Westwood SND1 audio


Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	(original)
+++ trunk/etc/codecs.conf	Wed Nov 29 11:51:39 2006
@@ -2503,6 +2503,13 @@
   driver ffmpeg
   dll adpcm_ima_ws
 
+audiocodec ffwssnd1
+  info "FFmpeg Westwood SND1"
+  status working
+  fourcc SND1 ; internal MPlayer FourCC
+  driver ffmpeg
+  dll ws_snd1
+
 audiocodec ffinterplaydpcm
   info "FFmpeg Interplay DPCM audio"
   status working

Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c	(original)
+++ trunk/libmpdemux/demux_lavf.c	Wed Nov 29 11:51:39 2006
@@ -84,6 +84,7 @@
     { CODEC_ID_SHORTEN,           MKTAG('s', 'h', 'r', 'n')},
     { CODEC_ID_TTA,               MKTAG('T', 'T', 'A', '1')},
     { CODEC_ID_WAVPACK,           MKTAG('W', 'V', 'P', 'K')},
+    { CODEC_ID_WESTWOOD_SND1,     MKTAG('S', 'N', 'D', '1')},
     { CODEC_ID_XAN_DPCM,          MKTAG('A', 'x', 'a', 'n')},
     { 0, 0 },
 };