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

[diego]

Author: diego
Date: Thu Nov 16 02:17:19 2006
New Revision: 20952

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

Log:
support for Interplay DPCM audio


Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	(original)
+++ trunk/etc/codecs.conf	Thu Nov 16 02:17:19 2006
@@ -2456,6 +2456,13 @@
   driver ffmpeg
   dll adpcm_ima_ws
 
+audiocodec ffinterplaydpcm
+  info "FFmpeg Interplay DPCM audio"
+  status working
+  fourcc INPA
+  driver ffmpeg
+  dll interplay_dpcm
+
 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 02:17:19 2006
@@ -74,6 +74,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_INTERPLAY_DPCM,MKTAG('I', 'N', 'P', 'A')},
     { CODEC_ID_PCM_S24BE,     MKTAG('i', 'n', '2', '4')},
     { CODEC_ID_PCM_S8,        MKTAG('t', 'w', 'o', 's')},
     { CODEC_ID_SHORTEN,       MKTAG('s', 'h', 'r', 'n')},