From efde2a70ffe6d8f5b53d0d1ea9c9c54fe9d979d4 Mon Sep 17 00:00:00 2001 From: Jerome Borsboom Date: Wed, 20 Jun 2018 15:17:34 +0200 Subject: [PATCH] avcodec/vc1: fix check for missing CBPTAB CBPTAB must be present in (non skipped) P and B pictures. Signed-off-by: Jerome Borsboom --- libavcodec/vc1dec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index fdbc852ec2..9519864c55 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -1088,7 +1088,9 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, av_log(v->s.avctx, AV_LOG_ERROR, "end mb y %d %d invalid\n", s->end_mb_y, s->start_mb_y); continue; } - if (!v->p_frame_skipped && s->pict_type != AV_PICTURE_TYPE_I && !v->cbpcy_vlc) { + if (((s->pict_type == AV_PICTURE_TYPE_P && !v->p_frame_skipped) || + (s->pict_type == AV_PICTURE_TYPE_B && !v->bi_type)) && + !v->cbpcy_vlc) { av_log(v->s.avctx, AV_LOG_ERROR, "missing cbpcy_vlc\n"); continue; }