diff --git a/libavformat/Makefile b/libavformat/Makefile
index 639f7cc2aa..256bd9e4e2 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -131,6 +131,7 @@ OBJS-$(CONFIG_TGP_MUXER)                 += movenc.o riff.o isom.o
 OBJS-$(CONFIG_THP_DEMUXER)               += thp.o
 OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER)        += tiertexseq.o
 OBJS-$(CONFIG_TTA_DEMUXER)               += tta.o
+OBJS-$(CONFIG_TXD_DEMUXER)               += txd.o
 OBJS-$(CONFIG_V4L2_DEMUXER)              += v4l2.o
 OBJS-$(CONFIG_VIDEO_GRAB_BKTR_DEMUXER)   += grab_bktr.o
 OBJS-$(CONFIG_VIDEO_GRAB_V4L_DEMUXER)    += grab.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 117d6f719d..276e4aca71 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -150,6 +150,7 @@ void av_register_all(void)
     REGISTER_DEMUXER (THP, thp);
     REGISTER_DEMUXER (TIERTEXSEQ, tiertexseq);
     REGISTER_DEMUXER (TTA, tta);
+    REGISTER_DEMUXER (TXD, txd);
     REGISTER_DEMUXER (V4L2, v4l2);
     REGISTER_DEMUXER (VC1, vc1);
     REGISTER_DEMUXER (VIDEO_GRAB_BKTR, video_grab_bktr);
diff --git a/libavformat/allformats.h b/libavformat/allformats.h
index 543fd3358d..698941e480 100644
--- a/libavformat/allformats.h
+++ b/libavformat/allformats.h
@@ -100,6 +100,7 @@ extern AVInputFormat swf_demuxer;
 extern AVInputFormat thp_demuxer;
 extern AVInputFormat tiertexseq_demuxer;
 extern AVInputFormat tta_demuxer;
+extern AVInputFormat txd_demuxer;
 extern AVInputFormat v4l2_demuxer;
 extern AVInputFormat vc1_demuxer;
 extern AVInputFormat video_grab_bktr_demuxer;
diff --git a/libavformat/txd.c b/libavformat/txd.c
new file mode 100644
index 0000000000..19febd160c
--- /dev/null
+++ b/libavformat/txd.c
@@ -0,0 +1,103 @@
+/*
+ * Renderware TeXture Dictionary (.txd) demuxer
+ * Copyright (c) 2007 Ivo van Poorten
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "avformat.h"
+
+#define TXD_FILE            0x16
+#define TXD_INFO            0x01
+#define TXD_EXTRA           0x03
+#define TXD_TEXTURE         0x15
+#define TXD_TEXTURE_DATA    0x01
+#define TXD_MARKER          0x1803ffff
+#define TXD_MARKER2         0x1003ffff
+
+static int txd_probe(AVProbeData * pd) {
+    if (AV_RL32(pd->buf  ) == TXD_FILE &&
+       (AV_RL32(pd->buf+8) == TXD_MARKER || AV_RL32(pd->buf+8) == TXD_MARKER2))
+        return AVPROBE_SCORE_MAX;
+    return 0;
+}
+
+static int txd_read_header(AVFormatContext *s, AVFormatParameters *ap) {
+    AVStream *st;
+
+    st = av_new_stream(s, 0);
+    if (!st)
+        return AVERROR_NOMEM;
+    st->codec->codec_type = CODEC_TYPE_VIDEO;
+    st->codec->codec_id = CODEC_ID_TXD;
+    st->codec->time_base.den = 5;
+    st->codec->time_base.num = 1;
+    /* the parameters will be extracted from the compressed bitstream */
+    return 0;
+}
+
+static int txd_read_packet(AVFormatContext *s, AVPacket *pkt) {
+    ByteIOContext *pb = &s->pb;
+    unsigned int id, chunk_size, marker;
+    int ret;
+
+next_chunk:
+    id         = get_le32(pb);
+    chunk_size = get_le32(pb);
+    marker     = get_le32(pb);
+
+    if (url_feof(&s->pb))
+        return AVERROR_IO;
+    if (marker != TXD_MARKER && marker != TXD_MARKER2) {
+        av_log(NULL, AV_LOG_ERROR, "marker does not match\n");
+        return AVERROR_IO;
+    }
+
+    switch (id) {
+        case TXD_INFO:
+            if (chunk_size > 100)
+                break;
+        case TXD_EXTRA:
+            url_fskip(&s->pb, chunk_size);
+        case TXD_FILE:
+        case TXD_TEXTURE:
+            goto next_chunk;
+        default:
+            av_log(NULL, AV_LOG_ERROR, "unknown chunk id %i\n", id);
+            return AVERROR_IO;
+    }
+
+    ret = av_get_packet(&s->pb, pkt, chunk_size);
+    pkt->stream_index = 0;
+
+    return ret <= 0 ? AVERROR_IO : ret;
+}
+
+static int txd_read_close(AVFormatContext *s) {
+    return 0;
+}
+
+AVInputFormat txd_demuxer =
+{
+    "txd",
+    "txd format",
+    0,
+    txd_probe,
+    txd_read_header,
+    txd_read_packet,
+    txd_read_close,
+};