mpeg4videodec: check resolution marker bits
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 15:34:29 +0000 (17:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 15:34:29 +0000 (17:34 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg4videodec.c

index 6cf1ec1..63508ef 100644 (file)
@@ -1626,11 +1626,11 @@ static int decode_vol_header(MpegEncContext *s, GetBitContext *gb){
 
     if (s->shape != BIN_ONLY_SHAPE) {
         if (s->shape == RECT_SHAPE) {
-            skip_bits1(gb);   /* marker */
+            check_marker(gb, "before width");
             width = get_bits(gb, 13);
-            skip_bits1(gb);   /* marker */
+            check_marker(gb, "before height");
             height = get_bits(gb, 13);
-            skip_bits1(gb);   /* marker */
+            check_marker(gb, "after height");
             if(width && height && !(s->width && s->codec_tag == AV_RL32("MP4S"))){ /* they should be non zero but who knows ... */
                 if (s->width && s->height &&
                     (s->width != width || s->height != height))