]> git.sesse.net Git - vlc/commitdiff
Add Tak support
authorJean-Baptiste Kempf <jb@videolan.org>
Tue, 6 May 2014 14:45:13 +0000 (16:45 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Tue, 6 May 2014 14:45:13 +0000 (16:45 +0200)
(Why noone added this?)

include/vlc_fourcc.h
modules/codec/avcodec/fourcc.c
src/misc/fourcc.c

index 5c38df76f389eef2d3cbc0bbbda83a8328db95da..b9ff963f933f12c3e3183eceabd5c0517ceb73fa 100644 (file)
 #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',' ')
index 57f8b99998c230c34abae1ed1e11fa829ddf7642..d9625d93bc9fc525be62f26fe8070e98a58d548d 100644 (file)
@@ -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
index df9f005e6f1c4f433093879de24fbfcd03eb41c8..1b48c05e1189a5aafba2338182da7814de403a31 100644 (file)
@@ -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[] = {