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

[cehoyos]

Author: cehoyos
Date: Thu Jul 19 08:23:54 2012
New Revision: 35035

Log:
Support FFmpeg APC ADPCM IMA audio decoder

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	Tue Jul 17 12:52:33 2012	(r35034)
+++ trunk/etc/codecs.conf	Thu Jul 19 08:23:54 2012	(r35035)
@@ -4462,6 +4462,13 @@ audiocodec ffadpcmimaamv
   driver ffmpeg
   dll adpcm_ima_amv
 
+audiocodec ffadpcmimaapc
+  info "FFmpeg APC IMA ADPCM audio"
+  status working
+  fourcc APCA  ; internal MPlayer FourCC
+  driver ffmpeg
+  dll adpcm_ima_apc
+
 audiocodec ffadpcmimasmjpeg
   info "FFmpeg SMJPEG IMA ADPCM audio"
   status working

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Tue Jul 17 12:52:33 2012	(r35034)
+++ trunk/libmpdemux/mp_taglists.c	Thu Jul 19 08:23:54 2012	(r35035)
@@ -29,6 +29,7 @@
 static const struct AVCodecTag mp_wav_tags[] = {
     { CODEC_ID_ADPCM_4XM,         MKTAG('4', 'X', 'M', 'A')},
     { CODEC_ID_ADPCM_ADX,         MKTAG('S', 'a', 'd', 'x')},
+    { CODEC_ID_ADPCM_IMA_APC,     MKTAG('A', 'P', 'C', 'A')},
     { 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')},