From ce828a247d5f6ae6cbb416dcdc56321be820ba4d Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 19 Aug 2018 10:15:53 +0200 Subject: [PATCH] avcodec/mpeg4videodec: Fix slice end detection in mpeg4_decode_studio_mb() Signed-off-by: Michael Niedermayer (cherry picked from commit 168d8d56bfb0c69684637f3d04889db647de6238) Signed-off-by: Michael Niedermayer --- libavcodec/mpeg4videodec.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 24c280df46..1686ed1001 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1955,6 +1955,14 @@ static int mpeg4_decode_studio_mb(MpegEncContext *s, int16_t block_[12][64]) return SLICE_END; } + //vcon-stp9L1.bits (first frame) + if (get_bits_left(&s->gb) == 0) + return SLICE_END; + + //vcon-stp2L1.bits, vcon-stp3L1.bits, vcon-stp6L1.bits, vcon-stp7L1.bits, vcon-stp8L1.bits, vcon-stp10L1.bits (first frame) + if (get_bits_left(&s->gb) < 8U && show_bits(&s->gb, get_bits_left(&s->gb)) == 0) + return SLICE_END; + return SLICE_OK; }