[MPlayer-cvslog] r34822 - in trunk: etc/codecs.conf libmpdemux/mp_taglists.c

[cehoyos]

Author: cehoyos
Date: Thu Mar 22 08:05:20 2012
New Revision: 34822

Log:
Support FFmpeg EA ADPCM R1, R2, R3 audio decoders.

Patch by Paul B Mahol, onemda gmail

Modified:
   trunk/etc/codecs.conf
   trunk/libmpdemux/mp_taglists.c

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Wed Mar 21 06:22:45 2012	(r34821)
+++ trunk/etc/codecs.conf	Thu Mar 22 08:05:20 2012	(r34822)
@@ -4561,6 +4561,27 @@ audiocodec ffadpcmea
   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

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Wed Mar 21 06:22:45 2012	(r34821)
+++ trunk/libmpdemux/mp_taglists.c	Thu Mar 22 08:05:20 2012	(r34822)
@@ -30,6 +30,9 @@ static const struct AVCodecTag mp_wav_ta
     { 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')},