Mercurial > mplayer.hg

changeset 20931:0cc7dfcb2e3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add support for Westwood IMA ADPCM audio.
author diego
date Wed, 15 Nov 2006 23:42:47 +0000
parents 29c478a2483f
children 2c50f72c3a5c
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	Wed Nov 15 21:52:34 2006 +0000
+++ b/etc/codecs.conf	Wed Nov 15 23:42:47 2006 +0000
@@ -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
--- a/libmpdemux/demux_lavf.c	Wed Nov 15 21:52:34 2006 +0000
+++ b/libmpdemux/demux_lavf.c	Wed Nov 15 23:42:47 2006 +0000
@@ -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')},