aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-01-07 00:22:56 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-01-31 00:25:20 +0100
commit5fe8dad4671e80f4dbc275df997b4d27a3d6f2cd (patch)
treebfa0db2f269a4f0c5e525cc658d501ca298199c3
parent593dea80f28e2be96d149f11118f8591c421b68c (diff)
downloadffmpeg-5fe8dad4671e80f4dbc275df997b4d27a3d6f2cd.tar.gz
avcodec/mpegvideo_enc: Clip bits_per_raw_sample within valid range
Fixes out of array read Fixes: test_case-mdc.264 (b47be15a120979f5a1a945c938cbef33) Found-by: Tyson Smith <twsmith@mozilla.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 13f266b50cc7554028d22480b7e4383968e64a63) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/mpegvideo_enc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 9bec400c61..9e53b5c080 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -316,6 +316,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
break;
}
+ avctx->bits_per_raw_sample = av_clip(avctx->bits_per_raw_sample, 0, 8);
s->bit_rate = avctx->bit_rate;
s->width = avctx->width;
s->height = avctx->height;