# HG changeset patch
# User cehoyos
# Date 1332399920 0
# Node ID 5ca635fce95ba0a9eb98a65f6aec0938c823da89
# Parent  4a3bd78892c4908c78213614a7c050331904957f
Support FFmpeg EA ADPCM R1, R2, R3 audio decoders.

Patch by Paul B Mahol, onemda gmail

diff -r 4a3bd78892c4 -r 5ca635fce95b etc/codecs.conf
--- 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
diff -r 4a3bd78892c4 -r 5ca635fce95b libmpdemux/mp_taglists.c
--- 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')},