X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fxpmdec.c;h=922dfc0f672dd1876b8cb638b6caaf68e5624e8a;hb=14fa0a4efbc989619860ed8ec0fd33dcdae558b0;hp=43dd9bc7e7ea97e1e585ad100e7aa2d41f699438;hpb=1811b7d1f5330e04a48b1d6425cf1ef6ed776ed1;p=ffmpeg diff --git a/libavcodec/xpmdec.c b/libavcodec/xpmdec.c index 43dd9bc7e7e..922dfc0f672 100644 --- a/libavcodec/xpmdec.c +++ b/libavcodec/xpmdec.c @@ -311,6 +311,7 @@ static int xpm_decode_frame(AVCodecContext *avctx, void *data, int ncolors, cpp, ret, i, j; int64_t size; uint32_t *dst; + int width, height; avctx->pix_fmt = AV_PIX_FMT_BGRA; @@ -332,12 +333,12 @@ static int xpm_decode_frame(AVCodecContext *avctx, void *data, ptr += mod_strcspn(ptr, "\""); if (sscanf(ptr, "\"%u %u %u %u\",", - &avctx->width, &avctx->height, &ncolors, &cpp) != 4) { + &width, &height, &ncolors, &cpp) != 4) { av_log(avctx, AV_LOG_ERROR, "missing image parameters\n"); return AVERROR_INVALIDDATA; } - if ((ret = ff_set_dimensions(avctx, avctx->width, avctx->height)) < 0) + if ((ret = ff_set_dimensions(avctx, width, height)) < 0) return ret; if ((ret = ff_get_buffer(avctx, p, 0)) < 0)