From f7813a5324be39d13ab536c245d15dfc602a7849 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Sun, 29 Dec 2013 12:19:38 +0000 Subject: basic type mechanism working --- ffmpeg/libavcodec/txd.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'ffmpeg/libavcodec/txd.c') diff --git a/ffmpeg/libavcodec/txd.c b/ffmpeg/libavcodec/txd.c index e8d483f..ad1a015 100644 --- a/ffmpeg/libavcodec/txd.c +++ b/ffmpeg/libavcodec/txd.c @@ -63,10 +63,9 @@ static int txd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, return AVERROR_PATCHWELCOME; } - if ((ret = av_image_check_size(w, h, 0, avctx)) < 0) + if ((ret = ff_set_dimensions(avctx, w, h)) < 0) return ret; - if (w != avctx->width || h != avctx->height) - avcodec_set_dimensions(avctx, w, h); + if ((ret = ff_get_buffer(avctx, p, 0)) < 0) return ret; @@ -134,9 +133,9 @@ unsupported: AVCodec ff_txd_decoder = { .name = "txd", + .long_name = NULL_IF_CONFIG_SMALL("Renderware TXD (TeXture Dictionary) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_TXD, .decode = txd_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Renderware TXD (TeXture Dictionary) image"), }; -- cgit v1.2.3