aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-05-28 00:19:56 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2020-06-08 20:45:56 +0200
commit4f33a9803a3068ce2d52289fc1db60375dc8b7a5 (patch)
tree8902aaaedfc9edbae9676c8171f695f76b8c38bb
parent3371d0611fcd31e0bc72553d88774512a58bd2ef (diff)
downloadffmpeg-4f33a9803a3068ce2d52289fc1db60375dc8b7a5.tar.gz
avcodec/mpeg12dec: Fix got_output
This makes got_output consistent with the code in slice_end() which sets the output in slice_end() if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) { int ret = av_frame_ref(pict, s->current_picture_ptr->f); ... } else { Fixes: assertion failure Fixes: 22178/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG1VIDEO_fuzzer-5664234440753152 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/mpeg12dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 40d054def5..54e122cd9d 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -2497,7 +2497,7 @@ static int decode_chunks(AVCodecContext *avctx, AVFrame *picture,
return ret;
else if (ret) {
// FIXME: merge with the stuff in mpeg_decode_slice
- if (s2->last_picture_ptr || s2->low_delay)
+ if (s2->last_picture_ptr || s2->low_delay || s2->pict_type == AV_PICTURE_TYPE_B)
*got_output = 1;
}
}