RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-20 13:57:00 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/mpeg4videodec: Do not corrupt bits_per_raw_sample

Browse Source 
Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2018-04-29 20:49:21 +02:00
parent 9f73ae31e0
commit 9e5d0860c0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mpeg4videodec.c
View File

@ -2999,6 +2999,7 @@ static int decode_studio_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb)
{ {
MpegEncContext *s = &ctx->m; MpegEncContext *s = &ctx->m;
int width, height; int width, height;
int bits_per_raw_sample;
skip_bits1(gb); /* random_accessible_vol */ skip_bits1(gb); /* random_accessible_vol */
skip_bits(gb, 8); /* video_object_type_indication */ 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; return AVERROR_INVALIDDATA;
} }
s->avctx->bits_per_raw_sample = get_bits(gb, 4); /* bit_depth */ bits_per_raw_sample = get_bits(gb, 4); /* bit_depth */
if (s->avctx->bits_per_raw_sample == 10) { if (bits_per_raw_sample == 10) {
if (ctx->rgb) { if (ctx->rgb) {
s->avctx->pix_fmt = AV_PIX_FMT_GBRP10; s->avctx->pix_fmt = AV_PIX_FMT_GBRP10;
} }
@ -3024,9 +3025,10 @@ static int decode_studio_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb)
} }
} }
else { 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; return AVERROR_PATCHWELCOME;
} }
s->avctx->bits_per_raw_sample = bits_per_raw_sample;
} }
if (ctx->shape == RECT_SHAPE) { if (ctx->shape == RECT_SHAPE) {
check_marker(s->avctx, gb, "before video_object_layer_width"); check_marker(s->avctx, gb, "before video_object_layer_width");