diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 14:01:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 14:01:02 +0100 |
| commit | 4a356512676629b4a289ea33f2b39b5f151cfae3 (patch) | |
| tree | c4391d9281d285e0c5c53a4000a3918de7dbaf31 /libavcodec/dpx.c | |
| parent | f016a23c7fa0b089a394e25eeefa5d5f4d99d926 (diff) | |
| parent | d6da372984c87fd6288c148c291065d6032ceda3 (diff) | |
Merge commit 'd6da372984c87fd6288c148c291065d6032ceda3'
* commit 'd6da372984c87fd6288c148c291065d6032ceda3':
eacmv: stop using deprecated avcodec_set_dimensions
dvdsubdec: stop using deprecated avcodec_set_dimensions
dvdec: stop using deprecated avcodec_set_dimensions
dpx: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/dpx.c
libavcodec/dvdec.c
libavcodec/dvdsubdec.c
libavcodec/eacmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dpx.c')
| -rw-r--r-- | libavcodec/dpx.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index 8468720615..5c3c3e81cb 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -111,11 +111,9 @@ static int decode_frame(AVCodecContext *avctx, buf = avpkt->data + 0x304; w = read32(&buf, endian); h = read32(&buf, endian); - if ((ret = av_image_check_size(w, h, 0, avctx)) < 0) - return ret; - if (w != avctx->width || h != avctx->height) - avcodec_set_dimensions(avctx, w, h); + if ((ret = ff_set_dimensions(avctx, w, h)) < 0) + return ret; // Need to end in 0x320 to read the descriptor buf += 20; |