aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-01 04:05:04 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-01 04:31:37 +0200
commit1e0c34fe71ae12667de0ea7c373ea16ae128a71f (patch)
tree3077fb247b7a1140e4c59c451c8bf83096ecea10
parentd8bbb99c51af08c76dd0a66588fecc5c0106844d (diff)
downloadffmpeg-1e0c34fe71ae12667de0ea7c373ea16ae128a71f.tar.gz
avformat/utils: Simplify get_std_framerate() check
This also avoids using a floating point operation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 7af2aabd80..c07bae210a 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2981,7 +2981,7 @@ void ff_rfps_calculate(AVFormatContext *ic)
if (st->info->codec_info_duration && st->info->codec_info_duration*av_q2d(st->time_base) < (1001*12.0)/get_std_framerate(j))
continue;
- if (!st->info->codec_info_duration && 1.0 < (1001*12.0)/get_std_framerate(j))
+ if (!st->info->codec_info_duration && get_std_framerate(j) < 1001*12)
continue;
if (av_q2d(st->time_base) * st->info->rfps_duration_sum / st->info->duration_count < (1001*12.0 * 0.8)/get_std_framerate(j))