Mercurial > mplayer.hg

changeset 36173:c99608e4d695

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support Nintendo Gamecube DTK files.
author cehoyos
date Wed, 15 May 2013 09:28:41 +0000
parents 7bf03a973142
children dabe949e41e9
files etc/codecs.conf libmpdemux/mp_taglists.c
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Mon May 13 19:34:44 2013 +0000
+++ b/etc/codecs.conf	Wed May 15 09:28:41 2013 +0000
@@ -4694,6 +4694,13 @@
   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
--- a/libmpdemux/mp_taglists.c	Mon May 13 19:34:44 2013 +0000
+++ b/libmpdemux/mp_taglists.c	Wed May 15 09:28:41 2013 +0000
@@ -31,6 +31,7 @@
     { 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') },