cavsdec: check dimensions being valid.

[ffmpeg] / libavcodec / utvideo.c

diff --git a/libavcodec/utvideo.c b/libavcodec/utvideo.c
index 471d85adc366ad72d9d8c13cd82d4ba515da4f8a..6d56f0575c048782c417b2d746dc7dffdac5064c 100644 (file)
--- a/libavcodec/utvideo.c
+++ b/libavcodec/utvideo.c
@@ -373,15 +373,13 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     if (c->pic.data[0])
         ff_thread_release_buffer(avctx, &c->pic);
 
-    c->pic.reference = 1;
+    c->pic.reference = 3;
     c->pic.buffer_hints = FF_BUFFER_HINTS_VALID;
     if ((ret = ff_thread_get_buffer(avctx, &c->pic)) < 0) {
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return ret;
     }
 
-    ff_thread_finish_setup(avctx);
-
     /* parse plane structure to get frame flags and validate slice offsets */
     bytestream2_init(&gb, buf, buf_size);
     for (i = 0; i < c->planes; i++) {
@@ -581,7 +579,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
 AVCodec ff_utvideo_decoder = {
     .name           = "utvideo",
     .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = CODEC_ID_UTVIDEO,
+    .id             = AV_CODEC_ID_UTVIDEO,
     .priv_data_size = sizeof(UtvideoContext),
     .init           = decode_init,
     .close          = decode_end,