Mercurial > mplayer.hg
comparison mencoder.c @ 32435:f7ff9bd54296
Cosmetics: split a couple long "if" lines.
Requested by Diego.
| author | corey |
|---|---|
| date | Thu, 21 Oct 2010 07:07:00 +0000 |
| parents | acb796d7ca50 |
| children | 728bd5c2aea7 |
comparison
equal
deleted
inserted
replaced
| 32434:acb796d7ca50 | 32435:f7ff9bd54296 |
|---|---|
| 370 /* This function returns the absolute time for which MEncoder will switch files | 370 /* This function returns the absolute time for which MEncoder will switch files |
| 371 * or move in the file so audio can be cut correctly. -1 if there is no limit. */ | 371 * or move in the file so audio can be cut correctly. -1 if there is no limit. */ |
| 372 static float stop_time(demuxer_t* demuxer, muxer_stream_t* mux_v) | 372 static float stop_time(demuxer_t* demuxer, muxer_stream_t* mux_v) |
| 373 { | 373 { |
| 374 float timeleft = -1; | 374 float timeleft = -1; |
| 375 if (play_n_frames >= 0) timeleft = adjusted_muxer_time(mux_v) + play_n_frames * (double)(mux_v->h.dwScale) / mux_v->h.dwRate; | 375 if (play_n_frames >= 0) |
| 376 if (end_at.type == END_AT_TIME && (timeleft > end_at.pos || timeleft == -1)) timeleft = end_at.pos; | 376 timeleft = adjusted_muxer_time(mux_v) + play_n_frames * (double)(mux_v->h.dwScale) / mux_v->h.dwRate; |
| 377 if (end_at.type == END_AT_TIME && (timeleft > end_at.pos || timeleft == -1)) | |
| 378 timeleft = end_at.pos; | |
| 377 if (next_edl_record && demuxer && demuxer->video) { // everything is OK to be checked | 379 if (next_edl_record && demuxer && demuxer->video) { // everything is OK to be checked |
| 378 float tmp = adjusted_muxer_time(mux_v) + next_edl_record->start_sec - demuxer->video->pts; | 380 float tmp = adjusted_muxer_time(mux_v) + next_edl_record->start_sec - demuxer->video->pts; |
| 379 if (timeleft == -1 || timeleft > tmp) { | 381 if (timeleft == -1 || timeleft > tmp) { |
| 380 // There's less time in EDL than what we already know | 382 // There's less time in EDL than what we already know |
| 381 if (next_edl_record->action == EDL_SKIP && edl_seeking) { | 383 if (next_edl_record->action == EDL_SKIP && edl_seeking) { |