github
/
mpv
mirror of https://github.com/mpv-player/mpv
1
Fork 0
Code Releases Activity

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
This commit is contained in:
rtogni 2006-07-08 12:33:12 +00:00
parent d20d9e8cf8
commit 6c3d242fd5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libmpdemux/video.c
View File

@ -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 ||