diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-11 17:34:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-11 17:34:29 +0200 |
| commit | 06137a496b93230326e62c9c7c220364fa6706df (patch) | |
| tree | a673b81953a312d457e3d3d462fdb3a37edd7640 /libavcodec/mpeg4videodec.c | |
| parent | 5717689c750bebb260305c21b93d09755c14ae9c (diff) | |
| download | android_external_ffmpeg-06137a496b93230326e62c9c7c220364fa6706df.tar.gz android_external_ffmpeg-06137a496b93230326e62c9c7c220364fa6706df.tar.bz2 android_external_ffmpeg-06137a496b93230326e62c9c7c220364fa6706df.zip | |
mpeg4videodec: check resolution marker bits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4videodec.c')
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 6 |
1 files changed, 3 insertions, 3 deletions
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)) |