Mercurial > mplayer.hg
changeset 34285:58dc65acc1f4
Support FFmpeg Funcom IMA ISS ADPCM decoding.
Patch by Paul B Mahol, onemda gmail
| author | cehoyos |
|---|---|
| date | Fri, 02 Dec 2011 19:23:43 +0000 |
| parents | f37139e765b9 |
| children | 6a1d279b91c0 |
| 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 Dec 02 19:14:23 2011 +0000 +++ b/etc/codecs.conf Fri Dec 02 19:23:43 2011 +0000 @@ -4272,6 +4272,13 @@ driver ffmpeg dll adpcm_ima_dk3 +audiocodec ffadpcmimaiss + info "FFmpeg Funcom IMA ISS ADPCM" + status working + fourcc AISS ; internal MPlayer FourCC + driver ffmpeg + dll adpcm_ima_iss + audiocodec dk3adpcm info "Duck DK3 ADPCM (rogue format number)" status working
--- a/libmpdemux/mp_taglists.c Fri Dec 02 19:14:23 2011 +0000 +++ b/libmpdemux/mp_taglists.c Fri Dec 02 19:23:43 2011 +0000 @@ -31,6 +31,7 @@ { CODEC_ID_ADPCM_ADX, MKTAG('S', 'a', 'd', 'x')}, { CODEC_ID_ADPCM_EA, MKTAG('A', 'D', 'E', 'A')}, { CODEC_ID_ADPCM_EA_MAXIS_XA, MKTAG('A', 'D', 'X', 'A')}, + { CODEC_ID_ADPCM_IMA_ISS, MKTAG('A', 'I', 'S', 'S')}, { CODEC_ID_ADPCM_IMA_WS, MKTAG('A', 'I', 'W', 'S')}, { CODEC_ID_ADPCM_THP, MKTAG('T', 'H', 'P', 'A')}, { CODEC_ID_ADPCM_XA, MKTAG('P', 'S', 'X', 'A')},