Take ticks per frame into account when warning about difference between
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>
Fri, 16 Apr 2010 22:58:56 +0000 (22:58 +0000)
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>
Fri, 16 Apr 2010 22:58:56 +0000 (22:58 +0000)
container and codec frame rate.

Originally committed as revision 22895 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffmpeg.c

index 60b134d..ba317c8 100644 (file)
--- 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(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",
 
                 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",