X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fsunrast.c;h=558b0edd8ffd5fdc50dafe70d4b7eafc7fdf2d3d;hb=c137fdd778e1bb82c2f0d7fa4a88adc97058d6d4;hp=456ab85a88aab7017b13800bf726c791e8108e3f;hpb=72415b2adb2c25f95ceede49001bb97ed9247dbb;p=ffmpeg diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c index 456ab85a88a..558b0edd8ff 100644 --- a/libavcodec/sunrast.c +++ b/libavcodec/sunrast.c @@ -20,6 +20,7 @@ */ #include "libavutil/intreadwrite.h" +#include "libavutil/imgutils.h" #include "avcodec.h" #define RT_OLD 0 @@ -97,7 +98,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data, if (p->data[0]) avctx->release_buffer(avctx, p); - if (avcodec_check_dimensions(avctx, w, h)) + if (av_image_check_size(w, h, 0, avctx)) return -1; if (w != avctx->width || h != avctx->height) avcodec_set_dimensions(avctx, w, h); @@ -106,7 +107,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data, return -1; } - p->pict_type = FF_I_TYPE; + p->pict_type = AV_PICTURE_TYPE_I; if (depth != 8 && maplength) { av_log(avctx, AV_LOG_WARNING, "useless colormap found or file is corrupted, trying to recover\n"); @@ -183,7 +184,7 @@ static av_cold int sunrast_end(AVCodecContext *avctx) { return 0; } -AVCodec sunrast_decoder = { +AVCodec ff_sunrast_decoder = { "sunrast", AVMEDIA_TYPE_VIDEO, CODEC_ID_SUNRAST,