From f32f7d8b24d1228df447be85046b9346292d936e Mon Sep 17 00:00:00 2001
From: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Date: Fri, 16 Apr 2010 22:58:56 +0000
Subject: [PATCH] Take ticks per frame into account when warning about
difference between container and codec frame rate.
Originally committed as revision 22895 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
ffmpeg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 60b134d8309..ba317c83bbc 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3058,7 +3058,7 @@ static void opt_input_file(const char *filename)
if(me_threshold)
enc->debug |= FF_DEBUG_MV;
- if (enc->time_base.den != rfps || enc->time_base.num != rfps_base) {
+ if (enc->time_base.den != rfps*enc->ticks_per_frame || enc->time_base.num != rfps_base) {
if (verbose >= 0)
fprintf(stderr,"\nSeems stream %d codec frame rate differs from container frame rate: %2.2f (%d/%d) -> %2.2f (%d/%d)\n",
--
GitLab