Mercurial > libavformat.hg

changeset 882:7a7a6eda769d libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nan fps fix
author michael
date Fri, 16 Dec 2005 15:51:16 +0000
parents 91dcb9da9be6
children 778e090e879d
files utils.c
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/utils.c	Mon Dec 12 01:56:46 2005 +0000
+++ b/utils.c	Fri Dec 16 15:51:16 2005 +0000
@@ -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);
     }