From 76f8c8cd055e979fd510b86af28379ef18255227 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 29 Apr 2018 20:49:21 +0200 Subject: [PATCH] avcodec/mpeg4videodec: Do not corrupt bits_per_raw_sample Reviewed-by: Kieran Kunhya Signed-off-by: Michael Niedermayer (cherry picked from commit 9e5d0860c043ba5d1e48c0f8c42b0fe3b6cbeba4) Signed-off-by: Michael Niedermayer --- libavcodec/mpeg4videodec.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 490f9fe046..ada5cdc6fa 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2999,6 +2999,7 @@ static int decode_studio_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb) { MpegEncContext *s = &ctx->m; int width, height; + int bits_per_raw_sample; skip_bits1(gb); /* random_accessible_vol */ skip_bits(gb, 8); /* video_object_type_indication */ @@ -3014,8 +3015,8 @@ static int decode_studio_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb) return AVERROR_INVALIDDATA; } - s->avctx->bits_per_raw_sample = get_bits(gb, 4); /* bit_depth */ - if (s->avctx->bits_per_raw_sample == 10) { + bits_per_raw_sample = get_bits(gb, 4); /* bit_depth */ + if (bits_per_raw_sample == 10) { if (ctx->rgb) { s->avctx->pix_fmt = AV_PIX_FMT_GBRP10; } @@ -3024,9 +3025,10 @@ static int decode_studio_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb) } } else { - avpriv_request_sample(s->avctx, "MPEG-4 Studio profile bit-depth %u", s->avctx->bits_per_raw_sample); + avpriv_request_sample(s->avctx, "MPEG-4 Studio profile bit-depth %u", bits_per_raw_sample); return AVERROR_PATCHWELCOME; } + s->avctx->bits_per_raw_sample = bits_per_raw_sample; } if (ctx->shape == RECT_SHAPE) { check_marker(s->avctx, gb, "before video_object_layer_width");