[FFmpeg-cvslog] avformat/utils: always av_reduce r_frame_rate

Marton Balint git at videolan.org
Thu Aug 17 22:56:32 EEST 2017


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Thu Aug 17 00:20:01 2017 +0200| [7160992431b029b31bf407443faeaba86dc755a3] | committer: Marton Balint

avformat/utils: always av_reduce r_frame_rate

Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: Marton Balint <cus at passwd.hu>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7160992431b029b31bf407443faeaba86dc755a3
---

 libavformat/utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 58283616dc..23865c88c4 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3943,8 +3943,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
             if (!st->r_frame_rate.num) {
                 if (    avctx->time_base.den * (int64_t) st->time_base.num
                     <= avctx->time_base.num * avctx->ticks_per_frame * (int64_t) st->time_base.den) {
-                    st->r_frame_rate.num = avctx->time_base.den;
-                    st->r_frame_rate.den = avctx->time_base.num * avctx->ticks_per_frame;
+                    av_reduce(&st->r_frame_rate.num, &st->r_frame_rate.den,
+                              avctx->time_base.den, (int64_t)avctx->time_base.num * avctx->ticks_per_frame, INT_MAX);
                 } else {
                     st->r_frame_rate.num = st->time_base.den;
                     st->r_frame_rate.den = st->time_base.num;



More information about the ffmpeg-cvslog mailing list