Mercurial > mplayer.hg

changeset 30833:0336ed6ed3c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support SEGA CRI adx codec with demuxer lavf.
author cehoyos
date Tue, 09 Mar 2010 14:33:11 +0000
parents 9e81c17f6e73
children e7eb5f0565b6
files etc/codecs.conf libmpdemux/mp_taglists.c
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Tue Mar 09 13:19:25 2010 +0000
+++ b/etc/codecs.conf	Tue Mar 09 14:33:11 2010 +0000
@@ -3678,6 +3678,13 @@
   driver realaud
   dll "atrc.bundle/Contents/MacOS/atrc"
 
+audiocodec ffadpcmadx
+  info "FFmpeg SEGA CRI adx codec"
+  status working
+  fourcc Sadx ; internal MPlayer FourCC
+  driver ffmpeg
+  dll adpcm_adx
+
 audiocodec ffadpcmimaamv
   info "FFmpeg AMV IMA ADPCM audio"
   status working
--- a/libmpdemux/mp_taglists.c	Tue Mar 09 13:19:25 2010 +0000
+++ b/libmpdemux/mp_taglists.c	Tue Mar 09 14:33:11 2010 +0000
@@ -23,6 +23,7 @@
 #include "libavformat/riff.h"
 
 static const AVCodecTag mp_wav_tags[] = {
+    { CODEC_ID_ADPCM_ADX,         MKTAG('S', 'a', 'd', 'x')},
     { CODEC_ID_ADPCM_4XM,         MKTAG('4', 'X', 'M', 'A')},
     { CODEC_ID_ADPCM_EA,          MKTAG('A', 'D', 'E', 'A')},
     { CODEC_ID_ADPCM_EA_MAXIS_XA, MKTAG('A', 'D', 'X', 'A')},