# HG changeset patch # User diego # Date 1163680392 0 # Node ID 40cc1d0964bc9b417ddc0bbc38fb8a7f669bcfc2 # Parent 7b56f3f4fa803f875b202c1e81e00165c91875f2 support for Electronic Arts ADPCM audio diff -r 7b56f3f4fa80 -r 40cc1d0964bc etc/codecs.conf --- a/etc/codecs.conf Thu Nov 16 12:28:39 2006 +0000 +++ b/etc/codecs.conf Thu Nov 16 12:33:12 2006 +0000 @@ -2478,6 +2478,13 @@ driver ffmpeg dll interplay_dpcm +audiocodec ffadpcmea + info "FFmpeg EA ADPCM audio" + status working + fourcc ADEA ; internal MPlayer FourCC + driver ffmpeg + dll adpcm_ea + audiocodec libdv info "raw DV audio decoder (libdv)" status working diff -r 7b56f3f4fa80 -r 40cc1d0964bc libmpdemux/demux_lavf.c --- a/libmpdemux/demux_lavf.c Thu Nov 16 12:28:39 2006 +0000 +++ b/libmpdemux/demux_lavf.c Thu Nov 16 12:33:12 2006 +0000 @@ -75,6 +75,7 @@ { CODEC_ID_ADPCM_4XM, MKTAG('4', 'X', 'M', 'A')}, { CODEC_ID_ADPCM_IMA_WS, MKTAG('A', 'I', 'W', 'S')}, { CODEC_ID_DSICINAUDIO, MKTAG('D', 'C', 'I', 'A')}, + { CODEC_ID_ADPCM_EA, MKTAG('A', 'D', 'E', 'A')}, { CODEC_ID_INTERPLAY_DPCM,MKTAG('I', 'N', 'P', 'A')}, { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4')}, { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's')},