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/ivi_common.c | |
| parent | e6b9d71ad9569b5d033058958da5155100ada1ab (diff) | |
| parent | 967cd6fafbf2fdec9cbe011296ad34a70212427e (diff) | |
| download | ffmpeg-bf92cd8178e0553a27971118e2b2b9e87e7b810b.tar.gz | |
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/ivi_common.c')
| -rw-r--r-- | libavcodec/ivi_common.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c index ab4c9958c4..9b5f5f876e 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -1056,7 +1056,10 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (!ctx->is_nonnull_frame(ctx)) return buf_size; - avcodec_set_dimensions(avctx, ctx->planes[0].width, ctx->planes[0].height); + result = ff_set_dimensions(avctx, ctx->planes[0].width, ctx->planes[0].height); + if (result < 0) + return result; + if ((result = ff_get_buffer(avctx, frame, 0)) < 0) return result; |