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

[diego]

Author: diego
Date: Thu Nov 16 00:42:47 2006
New Revision: 20947

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

Log:
Add support for Westwood IMA ADPCM audio.


Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	(original)
+++ trunk/etc/codecs.conf	Thu Nov 16 00:42:47 2006
@@ -2433,6 +2433,13 @@
   driver ffmpeg
   dll adpcm_4xm
 
+audiocodec ffadpcmimaws
+  info "FFmpeg Westwood IMA ADPCM audio"
+  status working
+  fourcc AIWS
+  driver ffmpeg
+  dll adpcm_ima_ws
+
 audiocodec libdv
   info "raw DV audio decoder (libdv)"
   status working

Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c	(original)
+++ trunk/libmpdemux/demux_lavf.c	Thu Nov 16 00:42:47 2006
@@ -73,6 +73,7 @@
 
 const CodecTag mp_wav_tags[] = {
     { CODEC_ID_ADPCM_4XM, MKTAG('4', 'X', 'M', 'A')},
+    { CODEC_ID_ADPCM_IMA_WS,  MKTAG('A', 'I', 'W', 'S')},
     { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4')},
     { CODEC_ID_PCM_S8,    MKTAG('t', 'w', 'o', 's')},
     { CODEC_ID_WAVPACK,   MKTAG('W', 'V', 'P', 'K')},