changeset 20895:798356663969

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.
author uau
date Tue, 14 Nov 2006 06:35:55 +0000
parents 8753befb60ad
children 52811235ee24
files mplayer.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Tue Nov 14 06:25:02 2006 +0000
+++ b/mplayer.c	Tue Nov 14 06:35:55 2006 +0000
@@ -4458,11 +4458,6 @@
 
         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 @@
   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 ===============================