Mercurial > mplayer.hg
changeset 34734:5ca635fce95b
Support FFmpeg EA ADPCM R1, R2, R3 audio decoders.
Patch by Paul B Mahol, onemda gmail
| author | cehoyos |
|---|---|
| date | Thu, 22 Mar 2012 07:05:20 +0000 |
| parents | 4a3bd78892c4 |
| children | 795e0f6a85e1 |
| files | etc/codecs.conf libmpdemux/mp_taglists.c |
| diffstat | 2 files changed, 24 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/codecs.conf Wed Mar 21 05:22:45 2012 +0000 +++ b/etc/codecs.conf Thu Mar 22 07:05:20 2012 +0000 @@ -4561,6 +4561,27 @@ driver ffmpeg dll adpcm_ea +audiocodec ffadpcmear1 + info "FFmpeg EA ADPCM R1 audio" + status working + fourcc EAR1 ; internal MPlayer FourCC + driver ffmpeg + dll adpcm_ea_r1 + +audiocodec ffadpcmear2 + info "FFmpeg EA ADPCM R2 audio" + status working + fourcc EAR2 ; internal MPlayer FourCC + driver ffmpeg + dll adpcm_ea_r2 + +audiocodec ffadpcmear3 + info "FFmpeg EA ADPCM R3 audio" + status working + fourcc EAR3 ; internal MPlayer FourCC + driver ffmpeg + dll adpcm_ea_r3 + audiocodec ffadpcmeamaxis info "FFmpeg EA MAXIS XA ADPCM audio" status working
--- a/libmpdemux/mp_taglists.c Wed Mar 21 05:22:45 2012 +0000 +++ b/libmpdemux/mp_taglists.c Thu Mar 22 07:05:20 2012 +0000 @@ -30,6 +30,9 @@ { CODEC_ID_ADPCM_4XM, MKTAG('4', 'X', 'M', 'A')}, { CODEC_ID_ADPCM_ADX, MKTAG('S', 'a', 'd', 'x')}, { CODEC_ID_ADPCM_EA, MKTAG('A', 'D', 'E', 'A')}, + { CODEC_ID_ADPCM_EA_R1, MKTAG('E', 'A', 'R', '1')}, + { CODEC_ID_ADPCM_EA_R2, MKTAG('E', 'A', 'R', '2')}, + { CODEC_ID_ADPCM_EA_R3, MKTAG('E', 'A', 'R', '3')}, { CODEC_ID_ADPCM_EA_MAXIS_XA, MKTAG('A', 'D', 'X', 'A')}, { CODEC_ID_ADPCM_IMA_EA_EACS, MKTAG('E', 'A', 'C', 'S')}, { CODEC_ID_ADPCM_IMA_ISS, MKTAG('A', 'I', 'S', 'S')},