diff options
| author | Jerome Borsboom <jerome.borsboom@carpalis.nl> | 2018-06-20 15:17:34 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2018-06-29 01:19:10 +0200 |
| commit | efde2a70ffe6d8f5b53d0d1ea9c9c54fe9d979d4 (patch) | |
| tree | 957bfbeafadb9c3920331b91955bad15b5068f3c | |
| parent | 975a1a81b28dc632d7c4bee99d5eccf09b9603d8 (diff) | |
| download | ffmpeg-efde2a70ffe6d8f5b53d0d1ea9c9c54fe9d979d4.tar.gz | |
avcodec/vc1: fix check for missing CBPTAB
CBPTAB must be present in (non skipped) P and B pictures.
Signed-off-by: Jerome Borsboom <jerome.borsboom@carpalis.nl>
| -rw-r--r-- | libavcodec/vc1dec.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; } |