From 967cd6fafbf2fdec9cbe011296ad34a70212427e Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 27 Oct 2013 10:02:26 +0100 Subject: libopenjpegdec: stop using deprecated avcodec_set_dimensions --- libavcodec/libopenjpegdec.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'libavcodec/libopenjpegdec.c') diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c index 006270108d..d6fca33a85 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -33,6 +33,7 @@ #include "libavutil/pixfmt.h" #include "libavutil/opt.h" #include "avcodec.h" +#include "internal.h" #include "thread.h" #define JP2_SIG_TYPE 0x6A502020 @@ -315,13 +316,9 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, height = (height + (1 << ctx->lowres) - 1) >> ctx->lowres; } - if ((ret = av_image_check_size(width, height, 0, avctx)) < 0) { - av_log(avctx, AV_LOG_ERROR, - "%dx%d dimension invalid.\n", width, height); + ret = ff_set_dimensions(avctx, width, height); + if (ret < 0) goto done; - } - - avcodec_set_dimensions(avctx, width, height); if (avctx->pix_fmt != AV_PIX_FMT_NONE) if (!libopenjpeg_matches_pix_fmt(image, avctx->pix_fmt)) -- cgit v1.2.3