Merge commit 'ddc589ce98c2bba1e59318b5b0224717325eac46'

[ffmpeg] / libavformat / bintext.c

diff --git a/libavformat/bintext.c b/libavformat/bintext.c
index d5046075a1cc69baa2ef3164b798435f7ef50b2a..d50a8d9f3448f77b4fe1e2262a8b2914fe052dbb 100644 (file)
--- a/libavformat/bintext.c
+++ b/libavformat/bintext.c
@@ -65,7 +65,7 @@ static AVStream * init_stream(AVFormatContext *s)
     avpriv_set_pts_info(st, 60, bin->framerate.den, bin->framerate.num);
 
     /* simulate tty display speed */
-    bin->chars_per_frame = FFMAX(av_q2d(st->time_base) * bin->chars_per_frame, 1);
+    bin->chars_per_frame = av_clip(av_q2d(st->time_base) * bin->chars_per_frame, 1, INT_MAX);
 
     return st;
 }