Mercurial > mplayer.hg

changeset 18394:4b4ef8d89e09

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
support for vfps OGM files patch by Elphel Inc. (blessed by Roberto)
author diego
date Sat, 06 May 2006 07:31:49 +0000
parents 09b64c87b29a
children 809ae393b2b5
files libmpdemux/video.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/video.c	Sat May 06 06:23:23 2006 +0000
+++ b/libmpdemux/video.c	Sat May 06 07:31:49 2006 +0000
@@ -607,13 +607,15 @@
       case DEMUXER_TYPE_MOV:
       case DEMUXER_TYPE_FILM:
       case DEMUXER_TYPE_VIVO:
+      case DEMUXER_TYPE_OGG:
       case DEMUXER_TYPE_REAL:
       case DEMUXER_TYPE_ASF: {
         float next_pts = ds_get_next_pts(d_video);
         float d= next_pts > 0 ? next_pts - d_video->pts : d_video->pts-pts1;
         if(d>=0){
           if(d>0){
-            if((int)sh_video->fps==1000)
+            /* 10000 is used for OGM only */
+            if((int)sh_video->fps==1000||(int)sh_video->fps==10000)
               mp_msg(MSGT_CPLAYER,MSGL_V,"\navg. framerate: %d fps             \n",(int)(1.0f/d));
 	    sh_video->frametime=d; // 1ms
             sh_video->fps=1.0f/d;