Mercurial > mplayer.hg
changeset 34941:5511c752c74c
Support FFmpeg APC ADPCM IMA audio decoder
Patch by Paul B Mahol, onemda gmail
| author | cehoyos |
|---|---|
| date | Thu, 19 Jul 2012 06:23:54 +0000 |
| parents | 6f2a96de70f3 |
| children | 1ad8731278a1 |
| 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 Jul 17 10:52:33 2012 +0000 +++ b/etc/codecs.conf Thu Jul 19 06:23:54 2012 +0000 @@ -4462,6 +4462,13 @@ driver ffmpeg dll adpcm_ima_amv +audiocodec ffadpcmimaapc + info "FFmpeg APC IMA ADPCM audio" + status working + fourcc APCA ; internal MPlayer FourCC + driver ffmpeg + dll adpcm_ima_apc + audiocodec ffadpcmimasmjpeg info "FFmpeg SMJPEG IMA ADPCM audio" status working
--- a/libmpdemux/mp_taglists.c Tue Jul 17 10:52:33 2012 +0000 +++ b/libmpdemux/mp_taglists.c Thu Jul 19 06:23:54 2012 +0000 @@ -29,6 +29,7 @@ static const struct AVCodecTag mp_wav_tags[] = { { CODEC_ID_ADPCM_4XM, MKTAG('4', 'X', 'M', 'A')}, { CODEC_ID_ADPCM_ADX, MKTAG('S', 'a', 'd', 'x')}, + { CODEC_ID_ADPCM_IMA_APC, MKTAG('A', 'P', 'C', 'A')}, { 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')},