From 2d5f1addbec2a1184b4e3b56dbfcb5416401a44f Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 18 Nov 2012 15:23:54 +0100 Subject: [PATCH] h264: fix integer overflow, assert failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/h264.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 7d348d2338..da43f1e457 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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; } -- 2.11.0