[MPlayer-cvslog] r18947 - trunk/libmpdemux/video.c

[rtogni]

Author: rtogni
Date: Sat Jul  8 14:33:12 2006
New Revision: 18947

Modified:
   trunk/libmpdemux/video.c

Log:
Revert r18878, always sync rm files using only pts (ignore framerate)


Modified: trunk/libmpdemux/video.c
==============================================================================
--- trunk/libmpdemux/video.c	(original)
+++ trunk/libmpdemux/video.c	Sat Jul  8 14:33:12 2006
@@ -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 ||