Detect null gop headers.

Fix issue2592. / mpeg4-bad-gvop.raw

Detect null gop headers.
Fix issue2592. / mpeg4-bad-gvop.raw
2034ba08 · Michael Niedermayer · 0a18b645 · 2034ba08
Commit 2034ba08 authored Feb 13, 2011 by Michael Niedermayer
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

mpeg4videodec.c libavcodec/mpeg4videodec.c +5 -0

No files found.
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -1495,6 +1495,11 @@ end:
 static int mpeg4_decode_gop_header(MpegEncContext * s, GetBitContext *gb){
    int hours, minutes, seconds;

+    if(!show_bits(gb, 18)){
+        av_log(s->avctx, AV_LOG_WARNING, "GOP header invalid\n");
+        return -1;
+    }
+
    hours= get_bits(gb, 5);
    minutes= get_bits(gb, 6);
    skip_bits1(gb);