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

[cehoyos]

Author: cehoyos
Date: Fri Dec  2 20:23:43 2011
New Revision: 34373

Log:
Support FFmpeg Funcom IMA ISS ADPCM decoding.

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	Fri Dec  2 20:14:23 2011	(r34372)
+++ trunk/etc/codecs.conf	Fri Dec  2 20:23:43 2011	(r34373)
@@ -4272,6 +4272,13 @@ audiocodec ffadpcmimadk3
   driver ffmpeg
   dll adpcm_ima_dk3
 
+audiocodec ffadpcmimaiss
+  info "FFmpeg Funcom IMA ISS ADPCM"
+  status working
+  fourcc AISS ; internal MPlayer FourCC
+  driver ffmpeg
+  dll adpcm_ima_iss
+
 audiocodec dk3adpcm
   info "Duck DK3 ADPCM (rogue format number)"
   status working

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Fri Dec  2 20:14:23 2011	(r34372)
+++ trunk/libmpdemux/mp_taglists.c	Fri Dec  2 20:23:43 2011	(r34373)
@@ -31,6 +31,7 @@ static const struct AVCodecTag mp_wav_ta
     { CODEC_ID_ADPCM_ADX,         MKTAG('S', 'a', 'd', 'x')},
     { CODEC_ID_ADPCM_EA,          MKTAG('A', 'D', 'E', 'A')},
     { CODEC_ID_ADPCM_EA_MAXIS_XA, MKTAG('A', 'D', 'X', 'A')},
+    { CODEC_ID_ADPCM_IMA_ISS,     MKTAG('A', 'I', 'S', 'S')},
     { CODEC_ID_ADPCM_IMA_WS,      MKTAG('A', 'I', 'W', 'S')},
     { CODEC_ID_ADPCM_THP,         MKTAG('T', 'H', 'P', 'A')},
     { CODEC_ID_ADPCM_XA,          MKTAG('P', 'S', 'X', 'A')},