diff options
| author | cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-03-09 14:33:11 +0000 |
|---|---|---|
| committer | cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-03-09 14:33:11 +0000 |
| commit | 12d78a9e5c7fe369588046954433d18437fd5083 (patch) | |
| tree | 188e7e62cfa77f9d61a5e37776efd5839f1de045 | |
| parent | 4abf80e24c825a0f5a0d9f26009f19c5e039ba6b (diff) | |
| download | mpv-12d78a9e5c7fe369588046954433d18437fd5083.tar.bz2 mpv-12d78a9e5c7fe369588046954433d18437fd5083.tar.xz | |
Support SEGA CRI adx codec with demuxer lavf.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30875 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | etc/codecs.conf | 7 | ||||
| -rw-r--r-- | libmpdemux/mp_taglists.c | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 40f6696552..06fc94911b 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -3678,6 +3678,13 @@ audiocodec raatrcmac 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 diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index 588df00af1..e19b53cf9c 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -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')}, |