[Ffmpeg-cvslog] CVS: ffmpeg/libavformat utils.c,1.169,1.170

Michael Niedermayer CVS michael
Fri Dec 16 16:51:19 CET 2005


Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv16971

Modified Files:
	utils.c 
Log Message:
nan fps fix


Index: utils.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/utils.c,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- utils.c	12 Dec 2005 01:56:46 -0000	1.169
+++ utils.c	16 Dec 2005 15:51:16 -0000	1.170
@@ -2618,7 +2618,12 @@
         }
         av_log(NULL, AV_LOG_DEBUG, ", %d/%d", st->time_base.num/g, st->time_base.den/g);
         if(st->codec->codec_type == CODEC_TYPE_VIDEO){
-            av_log(NULL, AV_LOG_INFO, ", %5.2f fps", av_q2d(st->r_frame_rate));
+            if(st->r_frame_rate.den && st->r_frame_rate.num)
+                av_log(NULL, AV_LOG_INFO, ", %5.2f fps(r)", av_q2d(st->r_frame_rate));
+/*            else if(st->time_base.den && st->time_base.num)
+                av_log(NULL, AV_LOG_INFO, ", %5.2f fps(m)", 1/av_q2d(st->time_base));*/
+            else
+                av_log(NULL, AV_LOG_INFO, ", %5.2f fps(c)", 1/av_q2d(st->codec->time_base));
         }
         av_log(NULL, AV_LOG_INFO, ": %s\n", buf);
     }





More information about the ffmpeg-cvslog mailing list