CBPTAB must be present in (non skipped) P and B pictures.
Signed-off-by: Jerome Borsboom
---
This patch set should fix decoding of the SA10135.vc1 test file to make it
bit-equal to the reference decoder.
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;
}
--
2.13.6
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
