[vlc-commits] avcodec: map RenderWare TXD

[Daniel Verkamp]

vlc | branch: master | Daniel Verkamp <daniel at drv.nu> | Fri Jan 10 18:00:20 2014 -0700| [8b84eb692169ff0bed44ba1fd9f95766ad25f35f] | committer: Jean-Baptiste Kempf

avcodec: map RenderWare TXD

Sample:
http://samples.mplayerhq.hu/game-formats/txd/fronten1.txd

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

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

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index dcce5b2..72ccd66 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -273,6 +273,7 @@
 #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 */
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index dd3411c..c0273c5 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -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 */
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 4252e6b..9bed057 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -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[] = {