diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 13:40:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 13:40:04 +0100 |
| commit | f016a23c7fa0b089a394e25eeefa5d5f4d99d926 (patch) | |
| tree | 150ac256bf70e36cdf7f072209d3871f0ede55ac /libavcodec/dnxhddec.c | |
| parent | 5ef0c00580e25afa32d5a6ef86559ffb9ce3b2dc (diff) | |
| parent | c7a5acabc537c2ce363165c31250aba341b1a990 (diff) | |
Merge commit 'c7a5acabc537c2ce363165c31250aba341b1a990'
* commit 'c7a5acabc537c2ce363165c31250aba341b1a990':
dnxhddec: stop using deprecated avcodec_set_dimensions
dirac: stop using deprecated avcodec_set_dimensions
cdxl: stop using deprecated avcodec_set_dimensions
avs: stop using deprecated avcodec_set_dimensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dnxhddec.c')
| -rw-r--r-- | libavcodec/dnxhddec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index 15e6c679e4..42775dfd2b 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -377,9 +377,9 @@ static int dnxhd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, first_field = 1; } - if (av_image_check_size(ctx->width, ctx->height, 0, avctx)) - return -1; - avcodec_set_dimensions(avctx, ctx->width, ctx->height); + ret = ff_set_dimensions(avctx, ctx->width, ctx->height); + if (ret < 0) + return ret; if (first_field) { if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) |