Mercurial > mplayer.hg
changeset 26760:424b12ccbc7b
add ffmpeg ea maxis xa adpcm audio decoder
| author | compn |
|---|---|
| date | Fri, 16 May 2008 23:31:05 +0000 |
| parents | 8eff880f638c |
| children | af8f8254a990 |
| 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 Fri May 16 09:42:28 2008 +0000 +++ b/etc/codecs.conf Fri May 16 23:31:05 2008 +0000 @@ -2787,6 +2787,13 @@ driver ffmpeg dll adpcm_ea +audiocodec ffadpcmeamaxis + info "FFmpeg EA MAXIS XA ADPCM audio" + status working + fourcc ADXA ; internal MPlayer FourCC + driver ffmpeg + dll adpcm_ea_maxis_xa + audiocodec ffxandpcm info "FFmpeg XAN DPCM audio" comment "only works with libavformat demuxer"
--- a/libmpdemux/mp_taglists.c Fri May 16 09:42:28 2008 +0000 +++ b/libmpdemux/mp_taglists.c Fri May 16 23:31:05 2008 +0000 @@ -24,6 +24,7 @@ static const AVCodecTag mp_wav_tags[] = { { 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')}, { CODEC_ID_ADPCM_IMA_WS, MKTAG('A', 'I', 'W', 'S')}, { CODEC_ID_ADPCM_THP, MKTAG('T', 'H', 'P', 'A')}, { CODEC_ID_AMR_NB, MKTAG('n', 'b', 0, 0)},