qsvdec: only access hwaccel_context is the pixel format is QSV

[ffmpeg] / libavcodec / fic.c

diff --git a/libavcodec/fic.c b/libavcodec/fic.c
index 45f56b95583d3377faa48e94d40ac89ab28c7334..b1286ebe6536242fa58c7ade6fdabbe200640ded 100644 (file)
--- a/libavcodec/fic.c
+++ b/libavcodec/fic.c
@@ -296,7 +296,9 @@ static int fic_decode_frame(AVCodecContext *avctx, void *data,
     /* Skip cursor data. */
     tsize = AV_RB24(src + 24);
     if (tsize > avpkt->size - FIC_HEADER_SIZE) {
-        av_log(avctx, AV_LOG_ERROR, "Invalid cursor data size.\n");
+        av_log(avctx, AV_LOG_ERROR,
+               "Packet is too small to contain cursor (%d vs %d bytes).\n",
+               tsize, avpkt->size - FIC_HEADER_SIZE);
         return AVERROR_INVALIDDATA;
     }
 
@@ -452,5 +454,5 @@ AVCodec ff_fic_decoder = {
     .init           = fic_decode_init,
     .decode         = fic_decode_frame,
     .close          = fic_decode_close,
-    .capabilities   = CODEC_CAP_DR1 | CODEC_CAP_SLICE_THREADS,
+    .capabilities   = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS,
 };