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

[cehoyos]

Author: cehoyos
Date: Wed May 15 11:28:41 2013
New Revision: 36269

Log:
Support Nintendo Gamecube DTK files.

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

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Mon May 13 21:34:44 2013	(r36268)
+++ trunk/etc/codecs.conf	Wed May 15 11:28:41 2013	(r36269)
@@ -4694,6 +4694,13 @@ audiocodec ffadpcmafc
   driver ffmpeg
   dll adpcm_afc
 
+audiocodec ffadpcmdtk
+  info "FFmpeg ADPCM Nintendo Gamecube DTK"
+  status working
+  fourcc "DTK " ; internal MPlayer FourCC
+  driver ffmpeg
+  dll adpcm_dtk
+
 audiocodec ffadpcmimadk4
   info "FFmpeg DK4 IMA ADPCM audio"
   status working

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Mon May 13 21:34:44 2013	(r36268)
+++ trunk/libmpdemux/mp_taglists.c	Wed May 15 11:28:41 2013	(r36269)
@@ -31,6 +31,7 @@ static const struct AVCodecTag mp_wav_ta
     { AV_CODEC_ID_ADPCM_ADX,         MKTAG('S', 'a', 'd', 'x') },
 #if LIBAVUTIL_VERSION_MICRO >= 100
     { AV_CODEC_ID_ADPCM_AFC,         MKTAG('A', 'F', 'C', ' ') },
+    { AV_CODEC_ID_ADPCM_DTK,         MKTAG('D', 'T', 'K', ' ') },
 #endif
     { AV_CODEC_ID_ADPCM_IMA_APC,     MKTAG('A', 'P', 'C', 'A') },
     { AV_CODEC_ID_ADPCM_EA,          MKTAG('A', 'D', 'E', 'A') },