[FFmpeg-cvslog] avcodec/mpegvideo_enc: Limit bitrate tolerance to the representable
Michael Niedermayer
git at videolan.org
Wed Oct 6 19:07:43 EEST 2021
ffmpeg | branch: release/4.4 | Michael Niedermayer <michael at niedermayer.cc> | Sun May 30 18:38:23 2021 +0200| [c524a8b4bed30b80cb70fa1e5e579f7199ffa45e] | committer: Michael Niedermayer
avcodec/mpegvideo_enc: Limit bitrate tolerance to the representable
Fixes: error: 1.66789e+11 is outside the range of representable values of type 'int'
Fixes: Ticket8201
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 245017ec8a87d6e4c764d06afeca37100b980d85)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c524a8b4bed30b80cb70fa1e5e579f7199ffa45e
---
libavcodec/mpegvideo_enc.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 69eabc08fe..cee3fdb36b 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -509,9 +509,13 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (!s->fixed_qscale &&
avctx->bit_rate * av_q2d(avctx->time_base) >
avctx->bit_rate_tolerance) {
+ double nbt = avctx->bit_rate * av_q2d(avctx->time_base) * 5;
av_log(avctx, AV_LOG_WARNING,
"bitrate tolerance %d too small for bitrate %"PRId64", overriding\n", avctx->bit_rate_tolerance, avctx->bit_rate);
- avctx->bit_rate_tolerance = 5 * avctx->bit_rate * av_q2d(avctx->time_base);
+ if (nbt <= INT_MAX) {
+ avctx->bit_rate_tolerance = nbt;
+ } else
+ avctx->bit_rate_tolerance = INT_MAX;
}
if (avctx->rc_max_rate &&
More information about the ffmpeg-cvslog
mailing list