diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 8cc3a01db8..acc8369e50 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -157,6 +157,7 @@ OBJS-$(CONFIG_TRUEMOTION2_DECODER)     += truemotion2.o
 OBJS-$(CONFIG_TRUESPEECH_DECODER)      += truespeech.o
 OBJS-$(CONFIG_TSCC_DECODER)            += tscc.o
 OBJS-$(CONFIG_TTA_DECODER)             += tta.o
+OBJS-$(CONFIG_TXD_DECODER)             += txd.o s3tc.o
 OBJS-$(CONFIG_ULTI_DECODER)            += ulti.o
 OBJS-$(CONFIG_VC1_DECODER)             += vc1.o vc1data.o vc1dsp.o
 OBJS-$(CONFIG_VCR1_DECODER)            += vcr1.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index e593a6e8f1..9f639727c3 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -139,6 +139,7 @@ void avcodec_register_all(void)
     REGISTER_DECODER(TRUEMOTION1, truemotion1);
     REGISTER_DECODER(TRUEMOTION2, truemotion2);
     REGISTER_DECODER(TSCC, tscc);
+    REGISTER_DECODER(TXD, txd);
     REGISTER_DECODER(ULTI, ulti);
     REGISTER_DECODER(VC1, vc1);
     REGISTER_DECODER(VCR1, vcr1);
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 29b15c7213..8f9838c0b7 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -163,6 +163,7 @@ enum CodecID {
     CODEC_ID_C93,
     CODEC_ID_BETHSOFTVID,
     CODEC_ID_PTX,
+    CODEC_ID_TXD,
 
     /* various PCM "codecs" */
     CODEC_ID_PCM_S16LE= 0x10000,
@@ -2346,6 +2347,7 @@ extern AVCodec truemotion2_decoder;
 extern AVCodec truespeech_decoder;
 extern AVCodec tscc_decoder;
 extern AVCodec tta_decoder;
+extern AVCodec txd_decoder;
 extern AVCodec ulti_decoder;
 extern AVCodec vc1_decoder;
 extern AVCodec vcr1_decoder;
diff --git a/libavcodec/txd.c b/libavcodec/txd.c
new file mode 100644
index 0000000000..454e412955
--- /dev/null
+++ b/libavcodec/txd.c
@@ -0,0 +1,165 @@
+/*
+ * Renderware TeXture Dictionary (.txd) image decoder
+ * 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
+ *
+ * See also: http://wiki.multimedia.cx/index.php?title=TXD
+ */
+
+#include "avcodec.h"
+#include "s3tc.h"
+
+typedef struct TXDContext {
+    AVFrame picture;
+} TXDContext;
+
+static int txd_init(AVCodecContext *avctx) {
+    TXDContext *s = avctx->priv_data;
+
+    avcodec_get_frame_defaults(&s->picture);
+    avctx->coded_frame = &s->picture;
+    s->picture.data[0] = NULL;
+
+    return 0;
+}
+
+static int txd_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
+                            uint8_t *buf, int buf_size) {
+    TXDContext * const s = avctx->priv_data;
+    AVFrame *picture = data;
+    AVFrame * const p = &s->picture;
+    unsigned int version, w, h, d3d_format, depth, stride, mipmap_count, flags;
+    unsigned int y, v;
+    uint8_t *ptr, *cur = buf;
+    uint32_t *palette = (uint32_t *)(cur + 88), *pal;
+
+    version         = AV_RL32(cur);
+    d3d_format      = AV_RL32(cur+76);
+    w               = AV_RL16(cur+80);
+    h               = AV_RL16(cur+82);
+    depth           = AV_RL8 (cur+84);
+    mipmap_count    = AV_RL8 (cur+85);
+    flags           = AV_RL8 (cur+87);
+    cur            += 92;
+
+    if (version < 8 || version > 9) {
+        av_log(avctx, AV_LOG_ERROR, "texture data version %i is unsupported\n",
+                                                                    version);
+        return -1;
+    }
+
+    if (depth == 8) {
+        avctx->pix_fmt = PIX_FMT_PAL8;
+        cur += 1024;
+    } else if (depth == 16 || depth == 32)
+        avctx->pix_fmt = PIX_FMT_RGB32;
+    else {
+        av_log(avctx, AV_LOG_ERROR, "depth of %i is unsupported\n", depth);
+        return -1;
+    }
+
+    if (p->data[0])
+        avctx->release_buffer(avctx, p);
+
+    if (avcodec_check_dimensions(avctx, w, h))
+        return -1;
+    if (w != avctx->width || h != avctx->height)
+        avcodec_set_dimensions(avctx, w, h);
+    if (avctx->get_buffer(avctx, p) < 0) {
+        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+        return -1;
+    }
+
+    p->pict_type = FF_I_TYPE;
+
+    ptr    = p->data[0];
+    stride = p->linesize[0];
+
+    if (depth == 8) {
+        pal = (uint32_t *) p->data[1];
+        for (y=0; y<256; y++) {
+            v = AV_RB32(palette+y);
+            pal[y] = (v>>8) + (v<<24);
+        }
+        for (y=0; y<h; y++) {
+            memcpy(ptr, cur, w);
+            ptr += stride;
+            cur += w;
+        }
+    } else if (depth == 16) {
+        switch (d3d_format) {
+        case 0:
+            if (!flags&1) goto unsupported;
+        case FF_S3TC_DXT1:
+            ff_decode_dxt1(cur, ptr, w, h, stride);
+            break;
+        case FF_S3TC_DXT3:
+            ff_decode_dxt3(cur, ptr, w, h, stride);
+            break;
+        default:
+            goto unsupported;
+        }
+    } else if (depth == 32) {
+        switch (d3d_format) {
+        case 0x15:
+        case 0x16:
+            for (y=0; y<h; y++) {
+                memcpy(ptr, cur, w*4);
+                ptr += stride;
+                cur += w*4;
+            }
+            break;
+        default:
+            goto unsupported;
+        }
+    }
+
+    for (; mipmap_count > 1; mipmap_count--)
+        cur += AV_RL32(cur) + 4;
+
+    *picture   = s->picture;
+    *data_size = sizeof(AVPicture);
+
+    return cur - buf;
+
+unsupported:
+    av_log(avctx, AV_LOG_ERROR, "unsupported d3d format (%08x)\n", d3d_format);
+    return -1;
+}
+
+static int txd_end(AVCodecContext *avctx) {
+    TXDContext *s = avctx->priv_data;
+
+    if (s->picture.data[0])
+        avctx->release_buffer(avctx, &s->picture);
+
+    return 0;
+}
+
+AVCodec txd_decoder = {
+    "txd",
+    CODEC_TYPE_VIDEO,
+    CODEC_ID_TXD,
+    sizeof(TXDContext),
+    txd_init,
+    NULL,
+    txd_end,
+    txd_decode_frame,
+    0,
+    NULL
+};