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

[diego]

Author: diego
Date: Thu Nov 16 13:33:12 2006
New Revision: 20957

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

Log:
support for Electronic Arts ADPCM audio


Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	(original)
+++ trunk/etc/codecs.conf	Thu Nov 16 13:33:12 2006
@@ -2478,6 +2478,13 @@
   driver ffmpeg
   dll interplay_dpcm
 
+audiocodec ffadpcmea
+  info "FFmpeg EA ADPCM audio"
+  status working
+  fourcc ADEA ; internal MPlayer FourCC
+  driver ffmpeg
+  dll adpcm_ea
+
 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 13:33:12 2006
@@ -75,6 +75,7 @@
     { CODEC_ID_ADPCM_4XM,     MKTAG('4', 'X', 'M', 'A')},
     { CODEC_ID_ADPCM_IMA_WS,  MKTAG('A', 'I', 'W', 'S')},
     { CODEC_ID_DSICINAUDIO,   MKTAG('D', 'C', 'I', 'A')},
+    { CODEC_ID_ADPCM_EA,      MKTAG('A', 'D', 'E', 'A')},
     { 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')},