summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorptt <ptt@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-21 09:32:58 +0000
committerptt <ptt@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-21 09:32:58 +0000
commit0e3c3727ceafb4193bae1a93f6ebb0efe2224bcc (patch)
tree7e6f8c7dc26c514f6132e77bfe1b5494724e64b3 /mplayer.c
parent3a62e0529fe70cb5a8287eec92c01cecb2c3dab0 (diff)
downloadmpv-0e3c3727ceafb4193bae1a93f6ebb0efe2224bcc.tar.bz2
mpv-0e3c3727ceafb4193bae1a93f6ebb0efe2224bcc.tar.xz
applied patch for -endpos, to work without a blit_frame, pointed out by Andrew Savchenko
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20329 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/mplayer.c b/mplayer.c
index 2f56a063ff..13496026ed 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -4351,6 +4351,11 @@ 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;
@@ -4365,10 +4370,6 @@ if(time_frame>0.001 && !(vo_flags&256)){
too_slow_frame_cnt++;
/* printf ("PANIC: too slow frame (%.3f)!\n", j); */
- // 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(vo_config_count) video_out->flip_page();
if (play_n_frames >= 0) {
--play_n_frames;