Mercurial > mplayer.hg
changeset 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 | 9beacce2d2b5 |
| files | mencoder.c |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mencoder.c Thu Oct 21 07:05:30 2010 +0000 +++ b/mencoder.c Thu Oct 21 07:07:00 2010 +0000 @@ -372,8 +372,10 @@ 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) {