Mercurial > mplayer.hg

changeset 2102:569a5d7b5d8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mov timing fixes (same way as asf)
author arpi
date Sat, 06 Oct 2001 00:59:45 +0000
parents 4ca146a57d17
children 3e55202cfdab
files mplayer.c
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Sat Oct 06 00:58:23 2001 +0000
+++ b/mplayer.c	Sat Oct 06 00:59:45 2001 +0000
@@ -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