[vlc-commits] Add Tak support

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue May  6 16:45:13 2014 +0200| [1a8240f59989228e2ad7042eef0d5378d42cb55f] | committer: Jean-Baptiste Kempf

Add Tak support

(Why noone added this?)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1a8240f59989228e2ad7042eef0d5378d42cb55f
---

 include/vlc_fourcc.h           |    1 +
 modules/codec/avcodec/fourcc.c |    4 +++-
 src/misc/fourcc.c              |    2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 5c38df7..b9ff963 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -404,6 +404,7 @@
 #define VLC_CODEC_INDEO_AUDIO                VLC_FOURCC('m','s',0x04,0x02)
 #define VLC_CODEC_METASOUND                  VLC_FOURCC('m','s',0x00,0x75)
 #define VLC_CODEC_ON2AVC                     VLC_FOURCC('m','s',0x05,0x00)
+#define VLC_CODEC_TAK                        VLC_FOURCC('t','a','k',' ')
 
 /* Subtitle */
 #define VLC_CODEC_SPU       VLC_FOURCC('s','p','u',' ')
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 57f8b99..d9625d9 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -453,7 +453,9 @@ static const struct
     { VLC_CODEC_OPUS, AV_CODEC_ID_OPUS, AUDIO_ES },
 #endif
     /* AV_CODEC_ID_COMFORT_NOISE */
-    /* AV_CODEC_ID_TAK */
+#if LIBAVCODEC_VERSION_CHECK( 54, 34, 0, 65, 100 )
+    { VLC_CODEC_TAK, AV_CODEC_ID_TAK, AUDIO_ES },
+#endif
 #if LIBAVCODEC_VERSION_CHECK( 55, 15, 0, 24, 100 )
     { VLC_CODEC_METASOUND, AV_CODEC_ID_METASOUND, AUDIO_ES },
 #endif
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index df9f005..1b48c05 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1447,6 +1447,8 @@ static const staticentry_t p_list_audio[] = {
     B(VLC_CODEC_INDEO_AUDIO, "Indeo Audio Coder"),
         A("ms\x04\x02"),
 
+    B(VLC_CODEC_TAK, "TAK (Tom's lossless Audio Kompressor)"),
+
     B(0, "")
 };
 static const staticentry_t p_list_spu[] = {