[Mplayer-cvslog] CVS: main mplayer.c,1.289,1.290

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv22041

Modified Files:
	mplayer.c 
Log Message:
mov timing fixes (same way as asf)

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -r1.289 -r1.290
--- mplayer.c	1 Oct 2001 23:32:45 -0000	1.289
+++ mplayer.c	6 Oct 2001 00:59:45 -0000	1.290
@@ -811,7 +811,7 @@
   while(!ds->eof){
     unsigned char* start;
     int in_size=ds_get_packet(ds,&start);
-    if( (demuxer->file_format==DEMUXER_TYPE_AVI || demuxer->file_format==DEMUXER_TYPE_ASF)
+    if( (demuxer->file_format==DEMUXER_TYPE_AVI || demuxer->file_format==DEMUXER_TYPE_ASF || demuxer->file_format==DEMUXER_TYPE_MOV)
 	&& stream_dump_type==2) fwrite(&in_size,1,4,f);
     if(in_size>0) fwrite(start,in_size,1,f);
   }
@@ -1360,6 +1360,11 @@
           sh_video->frametime=d; // 1ms
           sh_video->fps=1.0f/d;
         }
+    } else
+    if(demuxer->file_format==DEMUXER_TYPE_MOV && !force_fps){
+        // .MOV files has no fixed FPS - just frame durations!
+        float d=d_video->pts-pts1;
+	frame_time=d;
     }
     sh_video->timer+=frame_time;
     time_frame+=frame_time;  // for nosound