Mercurial > mplayer.hg

changeset 20941:40cc1d0964bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
support for Electronic Arts ADPCM audio
author diego
date Thu, 16 Nov 2006 12:33:12 +0000
parents 7b56f3f4fa80
children 2093d87ed14b
files etc/codecs.conf libmpdemux/demux_lavf.c
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Thu Nov 16 12:28:39 2006 +0000
+++ b/etc/codecs.conf	Thu Nov 16 12:33:12 2006 +0000
@@ -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
--- a/libmpdemux/demux_lavf.c	Thu Nov 16 12:28:39 2006 +0000
+++ b/libmpdemux/demux_lavf.c	Thu Nov 16 12:33:12 2006 +0000
@@ -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')},