Move endpos handling from page flip code to a saner location, change < to <=

If the shown frame was already at exactly the end pos we don't want to
show one more frame after it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20911 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
uau 2006-11-14 06:35:55 +00:00
parent 186e0d274e
commit 031e9068cc
1 changed files with 5 additions and 5 deletions

View File

@ -4458,11 +4458,6 @@ if(time_frame>0.001 && !(vo_flags&256))
current_module="flip_page"; current_module="flip_page";
if (!frame_time_remaining) { if (!frame_time_remaining) {
// FIXME: add size based support for -endpos
if ( end_at.type == END_AT_TIME && end_at.pos < sh_video->pts )
eof = PT_NEXT_ENTRY;
if(blit_frame){ if(blit_frame){
unsigned int t2=GetTimer(); unsigned int t2=GetTimer();
double tt; double tt;
@ -4513,6 +4508,11 @@ if(auto_quality>0){
set_video_quality(sh_video,output_quality); set_video_quality(sh_video,output_quality);
} }
// FIXME: add size based support for -endpos
if (end_at.type == END_AT_TIME &&
!frame_time_remaining && end_at.pos <= sh_video->pts)
eof = PT_NEXT_ENTRY;
} // end if(sh_video) } // end if(sh_video)
//============================ Handle PAUSE =============================== //============================ Handle PAUSE ===============================