[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[294] mplayerxp

[<nic...@us...>]

Revision: 294
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=294&view=rev
Author:   nickols_k
Date:     2012-11-03 16:20:40 +0000 (Sat, 03 Nov 2012)
Log Message:
-----------
move -play.frames into better place

Modified Paths:
--------------
    mplayerxp/mplayer.c
    mplayerxp/xmpcore/xmp_vdecoder.c

Modified: mplayerxp/mplayer.c
===================================================================
--- mplayerxp/mplayer.c	2012-11-03 15:58:48 UTC (rev 293)
+++ mplayerxp/mplayer.c	2012-11-03 16:20:40 UTC (rev 294)
@@ -2010,11 +2010,6 @@
     while(!eof){
 	int in_pause=0;
 
-	if(mp_conf.play_n_frames>=0){
-	    --mp_conf.play_n_frames;
-	    if(mp_conf.play_n_frames<0) eof = PT_NEXT_ENTRY;
-	}
-
 	eof |= xp_core->audio->eof;
 /*========================== UPDATE TIMERS ============================*/
 	MP_UNIT("Update timers");

Modified: mplayerxp/xmpcore/xmp_vdecoder.c
===================================================================
--- mplayerxp/xmpcore/xmp_vdecoder.c	2012-11-03 15:58:48 UTC (rev 293)
+++ mplayerxp/xmpcore/xmp_vdecoder.c	2012-11-03 16:20:40 UTC (rev 294)
@@ -165,10 +165,12 @@
 /*--------------------  Decode a frame: -----------------------*/
     in_size=video_read_frame_r(sh_video,&duration,&v_pts,&start,sh_video->fps);
     if(in_size<0) {
+	pt_exit_loop:
 	dae_decoded_mark_eof(xp_core->video);
 	priv->dae->eof=1;
 	break;
     }
+    if(mp_conf.play_n_frames>0 && xp_core->video->num_decoded_frames >= mp_conf.play_n_frames) goto pt_exit_loop;
     /* in_size==0: it's or broken stream or demuxer's bug */
     if(in_size==0 && priv->state!=Pth_Canceling) continue;
     /* frame was decoded into current decoder_idx */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.