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/eatgv.c | |
| parent | 4a356512676629b4a289ea33f2b39b5f151cfae3 (diff) | |
| parent | ec7063005ee67c0b4d4b83aa5118dd22ad1094e8 (diff) | |
| download | ffmpeg-bf688d23b5ff63395e4acf46b5d7fd5e610aab96.tar.gz | |
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/eatgv.c')
| -rw-r--r-- | libavcodec/eatgv.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c index bfdfb76b9b..6664cdb0f4 100644 --- a/libavcodec/eatgv.c +++ b/libavcodec/eatgv.c @@ -281,9 +281,10 @@ static int tgv_decode_frame(AVCodecContext *avctx, s->width = AV_RL16(&buf[0]); s->height = AV_RL16(&buf[2]); if (s->avctx->width != s->width || s->avctx->height != s->height) { - avcodec_set_dimensions(s->avctx, s->width, s->height); av_freep(&s->frame_buffer); av_frame_unref(&s->last_frame); + if ((ret = ff_set_dimensions(s->avctx, s->width, s->height)) < 0) + return ret; } pal_count = AV_RL16(&buf[6]); @@ -294,9 +295,6 @@ static int tgv_decode_frame(AVCodecContext *avctx, } } - if ((ret = av_image_check_size(s->width, s->height, 0, avctx)) < 0) - return ret; - if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) return ret; |