]> git.sesse.net Git - vlc/commitdiff
avcodec: map RenderWare TXD
authorDaniel Verkamp <daniel@drv.nu>
Sat, 11 Jan 2014 01:00:20 +0000 (18:00 -0700)
committerJean-Baptiste Kempf <jb@videolan.org>
Sat, 11 Jan 2014 10:09:13 +0000 (11:09 +0100)
Sample:
http://samples.mplayerhq.hu/game-formats/txd/fronten1.txd

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
include/vlc_fourcc.h
modules/codec/avcodec/fourcc.c
src/misc/fourcc.c

index dcce5b2396281d87c10afd80f946a8140ac3e396..72ccd66c94e3fd5aff8a61508eb405616496219f 100644 (file)
 #define VLC_CODEC_PNM             VLC_FOURCC('p','n','m',' ')
 #define VLC_CODEC_PCX             VLC_FOURCC('p','c','x',' ')
 #define VLC_CODEC_XWD             VLC_FOURCC('X','W','D',' ')
+#define VLC_CODEC_TXD             VLC_FOURCC('T','X','D',' ')
 
 
 /* Audio codec */
index dd3411c36014ba549bdee5707b0204ea766ea82c..c0273c5abca0b481fd766673c8bae61fa2a1b9b9 100644 (file)
@@ -158,7 +158,7 @@ static const struct
     /* AV_CODEC_ID_C93 */
     /* AV_CODEC_ID_BETHSOFTVID */
     /* AV_CODEC_ID_PTX */
-    /* AV_CODEC_ID_TXD */
+    { VLC_CODEC_TXD, AV_CODEC_ID_TXD, VIDEO_ES },
     { VLC_CODEC_VP6A, AV_CODEC_ID_VP6A, VIDEO_ES },
     { VLC_CODEC_AMV, AV_CODEC_ID_AMV, VIDEO_ES },
     /* AV_CODEC_ID_VB */
index 4252e6b51661ef9c1b63198f554039be0897277a..9bed057599e7d93bd2c26421f26c40ac6d027183 100644 (file)
@@ -1010,6 +1010,8 @@ static const staticentry_t p_list_video[] = {
 
     B(VLC_CODEC_THP, "GameCube THP video"),
 
+    B(VLC_CODEC_TXD, "RenderWare TXD"),
+
     B(0, "")
 };
 static const staticentry_t p_list_audio[] = {