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 | 9c0ece1b4f3f5e88c90883085d6bbc7eb0309314 (patch) | |
| tree | e56320998657dca6d52eec8029d207c4b73fb65b /libavcodec/sunrast.c | |
| parent | c755870d52c8c29676e5ba7ee9557adf4a7ca934 (diff) | |
sunrast: stop using deprecated avcodec_set_dimensions
Diffstat (limited to 'libavcodec/sunrast.c')
| -rw-r--r-- | libavcodec/sunrast.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c index 4147cf0b82..ffa685c19f 100644 --- a/libavcodec/sunrast.c +++ b/libavcodec/sunrast.c @@ -61,10 +61,6 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data, av_log(avctx, AV_LOG_ERROR, "invalid (compression) type\n"); return AVERROR_INVALIDDATA; } - if (av_image_check_size(w, h, 0, avctx)) { - av_log(avctx, AV_LOG_ERROR, "invalid image size\n"); - return AVERROR_INVALIDDATA; - } if (maptype == RMT_RAW) { avpriv_request_sample(avctx, "Unknown colormap type"); return AVERROR_PATCHWELCOME; @@ -90,8 +86,10 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_INVALIDDATA; } - if (w != avctx->width || h != avctx->height) - avcodec_set_dimensions(avctx, w, h); + ret = ff_set_dimensions(avctx, w, h); + if (ret < 0) + return ret; + if ((ret = ff_get_buffer(avctx, p, 0)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; |