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

[cehoyos]

Author: cehoyos
Date: Mon Oct  8 13:36:22 2012
New Revision: 35235

Log:
Support FFmpeg's TAK decoder.

Patch by Xidorn Quan, quanxunzhen gmail

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

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Sun Oct  7 21:15:16 2012	(r35234)
+++ trunk/etc/codecs.conf	Mon Oct  8 13:36:22 2012	(r35235)
@@ -5840,3 +5840,10 @@ audiocodec ffwavesynth
   driver ffmpeg
   dll "wavesynth"
 
+audiocodec fftak
+  info "FFmpeg TAK"
+  status working
+  fourcc "TAK " ; internal MPlayer FourCC
+  driver ffmpeg
+  dll "tak"
+

Modified: trunk/libmpdemux/extension.c
==============================================================================
--- trunk/libmpdemux/extension.c	Sun Oct  7 21:15:16 2012	(r35234)
+++ trunk/libmpdemux/extension.c	Mon Oct  8 13:36:22 2012	(r35235)
@@ -84,6 +84,7 @@ static struct {
         { "mac", DEMUXER_TYPE_LAVF },
         { "str", DEMUXER_TYPE_LAVF },
         { "cdg", DEMUXER_TYPE_LAVF },
+        { "tak", DEMUXER_TYPE_LAVF },
 
 // At least the following are hacks against broken autodetection
 // that should not be there

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Sun Oct  7 21:15:16 2012	(r35234)
+++ trunk/libmpdemux/mp_taglists.c	Mon Oct  8 13:36:22 2012	(r35235)
@@ -69,6 +69,7 @@ static const struct AVCodecTag mp_wav_ta
     { CODEC_ID_ROQ_DPCM,          MKTAG('R', 'o', 'Q', 'A')},
     { CODEC_ID_SHORTEN,           MKTAG('s', 'h', 'r', 'n')},
     { CODEC_ID_SPEEX,             MKTAG('s', 'p', 'x', ' ')},
+    { AV_CODEC_ID_TAK,            MKTAG('T', 'A', 'K', ' ')},
     { CODEC_ID_TTA,               MKTAG('T', 'T', 'A', '1')},
     { CODEC_ID_TWINVQ,            MKTAG('T', 'W', 'I', '2')},
 #if LIBAVUTIL_VERSION_MICRO >= 100