virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

sunrast: stop using deprecated avcodec_set_dimensions

Browse Source
This commit is contained in:
Anton Khirnov 2013-10-27 10:02:26 +01:00
parent c755870d52
commit 9c0ece1b4f
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/sunrast.c
View File

@ -61,10 +61,6 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
av_log(avctx, AV_LOG_ERROR, "invalid (compression) type\n"); av_log(avctx, AV_LOG_ERROR, "invalid (compression) type\n");
return AVERROR_INVALIDDATA; 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) { if (maptype == RMT_RAW) {
avpriv_request_sample(avctx, "Unknown colormap type"); avpriv_request_sample(avctx, "Unknown colormap type");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
@ -90,8 +86,10 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (w != avctx->width || h != avctx->height) ret = ff_set_dimensions(avctx, w, h);
avcodec_set_dimensions(avctx, w, h); if (ret < 0)
return ret;
if ((ret = ff_get_buffer(avctx, p, 0)) < 0) { if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret; return ret;