diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-16 12:33:12 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-16 12:33:12 +0000 |
commit | 77b21dc757027be99bf2ea4c0174d44402896860 (patch) | |
tree | 186bbf02816301aae7114ccdb6030bc403df39a7 | |
parent | 25d71db765baf68ea7ed29d3b01cd6f7cafc0507 (diff) | |
download | mpv-77b21dc757027be99bf2ea4c0174d44402896860.tar.bz2 mpv-77b21dc757027be99bf2ea4c0174d44402896860.tar.xz |
support for Electronic Arts ADPCM audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20957 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | etc/codecs.conf | 7 | ||||
-rw-r--r-- | libmpdemux/demux_lavf.c | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 4a4cdac963..dfc8d8285a 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -2478,6 +2478,13 @@ audiocodec ffinterplaydpcm 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 --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 47649f6f46..d02e9bee1d 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -75,6 +75,7 @@ const CodecTag mp_wav_tags[] = { { 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')}, |