[FFmpeg-cvslog] r22895 - trunk/ffmpeg.c

[bcoudurier]

Author: bcoudurier
Date: Sat Apr 17 00:58:56 2010
New Revision: 22895

Log:
Take ticks per frame into account when warning about difference between
container and codec frame rate.

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Fri Apr 16 22:36:24 2010	(r22894)
+++ trunk/ffmpeg.c	Sat Apr 17 00:58:56 2010	(r22895)
@@ -3058,7 +3058,7 @@ static void opt_input_file(const char *f
             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",