diff mbox

[FFmpeg-devel] avcodec/mpeg4videodec: Fix slice end detection in mpeg4_decode_studio_mb()

Message ID 20180819100104.25148-1-michael@niedermayer.cc
State Accepted
Commit 168d8d56bfb0c69684637f3d04889db647de6238
Headers show

Commit Message

Michael Niedermayer Aug. 19, 2018, 10:01 a.m. UTC 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/mpeg4videodec.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Michael Niedermayer Aug. 25, 2018, 4:51 p.m. UTC | #1 
On Sun, Aug 19, 2018 at 12:01:04PM +0200, Michael Niedermayer wrote:
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/mpeg4videodec.c | 8 ++++++++
>  1 file changed, 8 insertions(+)

applied

[...]
diff mbox

Patch

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;
 }