diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-10-27 10:02:26 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-10-31 20:14:16 +0100 |
| commit | ce9f5b13ed1eb1882479574c12af24cf0e2b8aaf (patch) | |
| tree | c45e51294db6238104849675d307a710d2f77293 | |
| parent | e7ea97039d0752b53703debce800281e55efa801 (diff) | |
| download | ffmpeg-ce9f5b13ed1eb1882479574c12af24cf0e2b8aaf.tar.gz | |
rv10: stop using deprecated avcodec_set_dimensions
| -rw-r--r-- | libavcodec/rv10.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index f790c1fa9e..f80625a891 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -28,6 +28,7 @@ #include "libavutil/imgutils.h" #include "avcodec.h" #include "error_resilience.h" +#include "internal.h" #include "mpegvideo.h" #include "mpeg4video.h" #include "h263.h" @@ -358,10 +359,12 @@ static int rv20_decode_picture_header(RVDecContext *rv) if (new_w != s->width || new_h != s->height) { av_log(s->avctx, AV_LOG_DEBUG, "attempting to change resolution to %dx%d\n", new_w, new_h); - if (av_image_check_size(new_w, new_h, 0, s->avctx) < 0) - return AVERROR_INVALIDDATA; ff_MPV_common_end(s); - avcodec_set_dimensions(s->avctx, new_w, new_h); + + ret = ff_set_dimensions(s->avctx, new_w, new_h); + if (ret < 0) + return ret; + s->width = new_w; s->height = new_h; if ((ret = ff_MPV_common_init(s)) < 0) |