diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 14:50:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 14:54:40 +0100 |
| commit | e6b9d71ad9569b5d033058958da5155100ada1ab (patch) | |
| tree | 963773bd0d58dea1732b6b5c15b1cdb77e9db580 /libavcodec/gifdec.c | |
| parent | 599c285162197dae164704131b8f3ff6276c8496 (diff) | |
| parent | 3b086317277e3f3b61c0343930d8e2570b278bd6 (diff) | |
| download | ffmpeg-e6b9d71ad9569b5d033058958da5155100ada1ab.tar.gz | |
Merge commit '3b086317277e3f3b61c0343930d8e2570b278bd6'
* commit '3b086317277e3f3b61c0343930d8e2570b278bd6':
h26[13]dec: stop using deprecated avcodec_set_dimensions
gifdec: stop using deprecated avcodec_set_dimensions
g2meet: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/gifdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/gifdec.c')
| -rw-r--r-- | libavcodec/gifdec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c index 4151b88856..ec1585cbca 100644 --- a/libavcodec/gifdec.c +++ b/libavcodec/gifdec.c @@ -463,9 +463,8 @@ static int gif_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, A if ((ret = gif_read_header1(s)) < 0) return ret; - if ((ret = av_image_check_size(s->screen_width, s->screen_height, 0, avctx)) < 0) + if ((ret = ff_set_dimensions(avctx, s->screen_width, s->screen_height)) < 0) return ret; - avcodec_set_dimensions(avctx, s->screen_width, s->screen_height); av_frame_unref(s->frame); if ((ret = ff_get_buffer(avctx, s->frame, 0)) < 0) |