diff options
author | Anton Khirnov <anton@khirnov.net> | 2013-10-27 13:02:26 +0400 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2013-10-31 23:14:15 +0400 |
commit | 3b086317277e3f3b61c0343930d8e2570b278bd6 (patch) | |
tree | 764d206a94e5daad4c326b4abc78e109f98e2bd7 | |
parent | 8255535c5f2da4e1363fae1f942b9ed28ce7552b (diff) |
h26[13]dec: stop using deprecated avcodec_set_dimensions
-rw-r--r-- | libavcodec/h261dec.c | 5 | ||||
-rw-r--r-- | libavcodec/h263dec.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 479da77958..4842fa0dd3 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -29,6 +29,7 @@ #include "mpegvideo.h" #include "h263.h" #include "h261.h" +#include "internal.h" #define H261_MBA_VLC_BITS 9 #define H261_MTYPE_VLC_BITS 6 @@ -607,7 +608,9 @@ retry: s->parse_context = pc; } if (!s->context_initialized) { - avcodec_set_dimensions(avctx, s->width, s->height); + ret = ff_set_dimensions(avctx, s->width, s->height); + if (ret < 0) + return ret; goto retry; } diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 8060d8f284..c52fc00515 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -600,7 +600,9 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, /* H.263 could change picture size any time */ s->context_reinit = 0; - avcodec_set_dimensions(avctx, s->width, s->height); + ret = ff_set_dimensions(avctx, s->width, s->height); + if (ret < 0) + return ret; if ((ret = ff_MPV_common_frame_size_change(s))) return ret; |