Commit 2d5f1add authored by Michael Niedermayer's avatar Michael Niedermayer

h264: fix integer overflow, assert failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 1a947dfa
......@@ -1104,8 +1104,12 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx)
h->x264_build = -1;
ff_h264_reset_sei(h);
if (avctx->codec_id == AV_CODEC_ID_H264) {
if (avctx->ticks_per_frame == 1)
s->avctx->time_base.den *= 2;
if (avctx->ticks_per_frame == 1) {
if(s->avctx->time_base.den < INT_MAX/2) {
s->avctx->time_base.den *= 2;
} else
s->avctx->time_base.num /= 2;
}
avctx->ticks_per_frame = 2;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment