Mercurial > mplayer.hg

changeset 18942:cf05a9897d1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert r18878, always sync rm files using only pts (ignore framerate)
author rtogni
date Sat, 08 Jul 2006 12:33:12 +0000
parents 9a90621765b0
children 715ff03d09e8
files libmpdemux/video.c
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/video.c	Sat Jul 08 12:23:36 2006 +0000
+++ b/libmpdemux/video.c	Sat Jul 08 12:33:12 2006 +0000
@@ -598,7 +598,6 @@
         }
       }
       break;
-      case DEMUXER_TYPE_REAL:
       case DEMUXER_TYPE_LAVF:
         if((int)sh_video->fps==1000 || (int)sh_video->fps<=1){
           float next_pts = ds_get_next_pts(d_video);
@@ -608,6 +607,14 @@
           } 
         }
       break;
+      case DEMUXER_TYPE_REAL:
+        {
+          float next_pts = ds_get_next_pts(d_video);
+          float d = next_pts > 0 ? next_pts - d_video->pts : d_video->pts - pts1;
+
+          frame_time = (d >= 0) ? d : 0.001;
+        }
+      break;
     }
     
     if(demuxer->file_format==DEMUXER_TYPE_MPEG_PS ||