summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/codecs.conf7
-rw-r--r--libmpdemux/demux_lavf.c1
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')},