Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / txd.c

diff --git a/libavcodec/txd.c b/libavcodec/txd.c
index cf88a9b3bb6aa260723393544f740af1c432b71a..344187d7da176991d9c545168b95dad7a27db053 100644 (file)
--- a/libavcodec/txd.c
+++ b/libavcodec/txd.c
@@ -47,7 +47,8 @@ static int txd_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     GetByteContext gb;
     AVFrame *picture = data;
     AVFrame * const p = &s->picture;
-    unsigned int version, w, h, d3d_format, depth, stride, mipmap_count, flags;
+    unsigned int version, w, h, d3d_format, depth, stride, flags;
+    unsigned int av_unused mipmap_count;
     unsigned int y, v;
     uint8_t *ptr;
     uint32_t *pal;
@@ -171,5 +172,5 @@ AVCodec ff_txd_decoder = {
     .close          = txd_end,
     .decode         = txd_decode_frame,
     .capabilities   = CODEC_CAP_DR1,
-    .long_name = NULL_IF_CONFIG_SMALL("Renderware TXD (TeXture Dictionary) image"),
+    .long_name      = NULL_IF_CONFIG_SMALL("Renderware TXD (TeXture Dictionary) image"),
 };