diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:07:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:07:25 +0100 |
| commit | bf92cd8178e0553a27971118e2b2b9e87e7b810b (patch) | |
| tree | 3cab52ceebfa519d6a8eaccc123e81bcab48f45f /libavcodec/libopenjpegdec.c | |
| parent | e6b9d71ad9569b5d033058958da5155100ada1ab (diff) | |
| parent | 967cd6fafbf2fdec9cbe011296ad34a70212427e (diff) | |
Merge commit '967cd6fafbf2fdec9cbe011296ad34a70212427e'
* commit '967cd6fafbf2fdec9cbe011296ad34a70212427e':
libopenjpegdec: stop using deprecated avcodec_set_dimensions
kgv1dec: stop using deprecated avcodec_set_dimensions
ivi_common: stop using deprecated avcodec_set_dimensions
indeo3: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/ivi_common.c
libavcodec/kgv1dec.c
libavcodec/libopenjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libopenjpegdec.c')
| -rw-r--r-- | libavcodec/libopenjpegdec.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c index 93f47a21d5..0543e3a897 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -32,6 +32,7 @@ #include "libavutil/pixfmt.h" #include "libavutil/opt.h" #include "avcodec.h" +#include "internal.h" #include "thread.h" #if HAVE_OPENJPEG_1_5_OPENJPEG_H @@ -296,13 +297,9 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, width = image->x1 - image->x0; height = image->y1 - image->y0; - 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)) |