From 06137a496b93230326e62c9c7c220364fa6706df Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 11 Aug 2013 17:34:29 +0200 Subject: mpeg4videodec: check resolution marker bits Signed-off-by: Michael Niedermayer --- libavcodec/mpeg4videodec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavcodec/mpeg4videodec.c') diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 6cf1ec1a32..63508ef252 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -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)) -- cgit v1.2.3