[MPlayer-cvslog] CVS: main/libmpdemux video.c,1.62,1.63

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv11301/libmpdemux

Modified Files:
	video.c 
Log Message:
support for vfps OGM files
patch by Elphel Inc. (blessed by Roberto)


Index: video.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/video.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- video.c	23 Apr 2006 12:29:10 -0000	1.62
+++ video.c	6 May 2006 07:31:49 -0000	1.63
@@ -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;