[MPlayer-cvslog] r20913 - trunk/mplayer.c
uau
subversion at mplayerhq.hu
Tue Nov 14 07:49:38 CET 2006
Author: uau
Date: Tue Nov 14 07:49:37 2006
New Revision: 20913
Modified:
trunk/mplayer.c
Log:
Move -frames check out of frame flip code (like -endpos earlier)
Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c (original)
+++ trunk/mplayer.c Tue Nov 14 07:49:37 2006
@@ -4460,10 +4460,6 @@
double tt;
if(vo_config_count) video_out->flip_page();
- if (play_n_frames >= 0) {
- --play_n_frames;
- if (play_n_frames <= 0) eof = PT_NEXT_ENTRY;
- }
// usec_sleep(50000); // test only!
t2=GetTimer()-t2;
@@ -4495,6 +4491,12 @@
set_video_quality(sh_video,output_quality);
}
+ if (play_n_frames >= 0 && !frame_time_remaining && blit_frame) {
+ --play_n_frames;
+ if (play_n_frames <= 0) eof = PT_NEXT_ENTRY;
+ }
+
+
// FIXME: add size based support for -endpos
if (end_at.type == END_AT_TIME &&
!frame_time_remaining && end_at.pos <= sh_video->pts)
More information about the MPlayer-cvslog
mailing list