diff options
author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-14 06:35:55 +0000 |
---|---|---|
committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-14 06:35:55 +0000 |
commit | 031e9068ccc7109b8cd9e3b352d651fcb4722de3 (patch) | |
tree | 68a6cd6e70d309e75f8ec1ac8d4986af1a6aecf6 /mplayer.c | |
parent | 186e0d274e07845a6dc2e7eea2b1f52596f3fd25 (diff) | |
download | mpv-031e9068ccc7109b8cd9e3b352d651fcb4722de3.tar.bz2 mpv-031e9068ccc7109b8cd9e3b352d651fcb4722de3.tar.xz |
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
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -4458,11 +4458,6 @@ if(time_frame>0.001 && !(vo_flags&256)) current_module="flip_page"; 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){ unsigned int t2=GetTimer(); double tt; @@ -4513,6 +4508,11 @@ if(auto_quality>0){ 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) //============================ Handle PAUSE =============================== |