diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 14:09:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 14:09:17 +0100 |
| commit | bf688d23b5ff63395e4acf46b5d7fd5e610aab96 (patch) | |
| tree | ee2a25164d980386ac49455a96b0b1aa947955ec /libavcodec/eamad.c | |
| parent | 4a356512676629b4a289ea33f2b39b5f151cfae3 (diff) | |
| parent | ec7063005ee67c0b4d4b83aa5118dd22ad1094e8 (diff) | |
Merge commit 'ec7063005ee67c0b4d4b83aa5118dd22ad1094e8'
* commit 'ec7063005ee67c0b4d4b83aa5118dd22ad1094e8':
eatqi: stop using deprecated avcodec_set_dimensions
eatgv: stop using deprecated avcodec_set_dimensions
eatgq: stop using deprecated avcodec_set_dimensions
eamad: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/eamad.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/eamad.c')
| -rw-r--r-- | libavcodec/eamad.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c index 6d8291e514..9ef216fd69 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -263,12 +263,11 @@ static int decode_frame(AVCodecContext *avctx, } if (avctx->width != width || avctx->height != height) { + av_frame_unref(&s->last_frame); if((width * height)/2048*7 > buf_end-buf) return AVERROR_INVALIDDATA; - if ((ret = av_image_check_size(width, height, 0, avctx)) < 0) + if ((ret = ff_set_dimensions(avctx, width, height)) < 0) return ret; - avcodec_set_dimensions(avctx, width, height); - av_frame_unref(&s->last_frame); } if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) |