# HG changeset patch # User rtogni # Date 1152361992 0 # Node ID cf05a9897d1b4c4765e59887e3a11b3544a62d4e # Parent 9a90621765b03699c882a329e50ed51726ddf566 Revert r18878, always sync rm files using only pts (ignore framerate) diff -r 9a90621765b0 -r cf05a9897d1b libmpdemux/video.c --- 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 ||