[MPlayer-cvslog] r32521 - trunk/mencoder.c

corey subversion at mplayerhq.hu
Thu Oct 21 09:07:00 CEST 2010


Author: corey
Date: Thu Oct 21 09:07:00 2010
New Revision: 32521

Log:
Cosmetics: split a couple long "if" lines.
Requested by Diego.

Modified:
   trunk/mencoder.c

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	Thu Oct 21 09:05:30 2010	(r32520)
+++ trunk/mencoder.c	Thu Oct 21 09:07:00 2010	(r32521)
@@ -372,8 +372,10 @@ static double adjusted_muxer_time(muxer_
 static float stop_time(demuxer_t* demuxer, muxer_stream_t* mux_v)
 {
 	float timeleft = -1;
-	if (play_n_frames >= 0) timeleft = adjusted_muxer_time(mux_v) + play_n_frames * (double)(mux_v->h.dwScale) / mux_v->h.dwRate;
-	if (end_at.type == END_AT_TIME && (timeleft > end_at.pos || timeleft == -1)) timeleft = end_at.pos;
+	if (play_n_frames >= 0)
+		timeleft = adjusted_muxer_time(mux_v) + play_n_frames * (double)(mux_v->h.dwScale) / mux_v->h.dwRate;
+	if (end_at.type == END_AT_TIME && (timeleft > end_at.pos || timeleft == -1))
+		timeleft = end_at.pos;
 	if (next_edl_record && demuxer && demuxer->video) { // everything is OK to be checked
 		float tmp = adjusted_muxer_time(mux_v) + next_edl_record->start_sec - demuxer->video->pts;
 		if (timeleft == -1 || timeleft > tmp) {


More information about the MPlayer-cvslog mailing list