Skip to content

F
ffmpeg
Commit 666e29fe authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

avutil/mathematics/av_add_stable: Avoid av_cmp_q() call 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent e9add0d8
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
libavutil/mathematics.c
View file @ 666e29fe
...@@ -198,11 +198,10 @@ int64_t av_add_stable(AVRational ts_tb, int64_t ts, AVRational inc_tb, int64_t i ...@@ -198,11 +198,10 @@ int64_t av_add_stable(AVRational ts_tb, int64_t ts, AVRational inc_tb, int64_t i
if (m % d == 0) if (m % d == 0)
return ts + m / d; return ts + m / d;
if (m < d)
if (av_cmp_q(inc_tb, ts_tb) < 0) {
//increase step is too small for even 1 step to be representable
return ts; return ts;
} else {
{
int64_t old = av_rescale_q(ts, ts_tb, inc_tb); int64_t old = av_rescale_q(ts, ts_tb, inc_tb);
int64_t old_ts = av_rescale_q(old, inc_tb, ts_tb); int64_t old_ts = av_rescale_q(old, inc_tb, ts_tb);
return av_rescale_q(old + 1, inc_tb, ts_tb) + (ts - old_ts); return av_rescale_q(old + 1, inc_tb, ts_tb) + (ts - old_ts);
......
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