diff options
| author | rtogni <rtogni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-08 12:33:12 +0000 |
|---|---|---|
| committer | rtogni <rtogni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-08 12:33:12 +0000 |
| commit | 6c3d242fd58db08df907e8e8dc7d60a18522701e (patch) | |
| tree | 94a971b01ce6bb8902e6202ba7fea8eeb8abf6d0 /libmpdemux | |
| parent | d20d9e8cf84ad72553774304a3f96597d5e45023 (diff) | |
| download | mpv-6c3d242fd58db08df907e8e8dc7d60a18522701e.tar.bz2 mpv-6c3d242fd58db08df907e8e8dc7d60a18522701e.tar.xz | |
Revert r18878, always sync rm files using only pts (ignore framerate)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18947 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/video.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 6cca94fc7c..40e7689e6d 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -598,7 +598,6 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** } } 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 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** } } 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 || |