diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-10-18 09:17:12 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-10-25 16:28:52 +0200 |
| commit | a75034300fedba861454241abef0db6cfb2599cf (patch) | |
| tree | 166fc0678d1c5ee9e8b833280f7c9ea58591eacd | |
| parent | f172132f825cec4e446a5bdde4ffa9065ba9061f (diff) | |
| download | ffmpeg-a75034300fedba861454241abef0db6cfb2599cf.tar.gz | |
lavf: simplify by using FFMAX/FFMIN.
| -rw-r--r-- | libavformat/utils.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index d0a7fb90be..640fa70c3d 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1848,27 +1848,22 @@ static void update_stream_timings(AVFormatContext *ic) st = ic->streams[i]; if (st->start_time != AV_NOPTS_VALUE && st->time_base.den) { start_time1= av_rescale_q(st->start_time, st->time_base, AV_TIME_BASE_Q); - if (start_time1 < start_time) - start_time = start_time1; + start_time = FFMIN(start_time, start_time1); if (st->duration != AV_NOPTS_VALUE) { end_time1 = start_time1 + av_rescale_q(st->duration, st->time_base, AV_TIME_BASE_Q); - if (end_time1 > end_time) - end_time = end_time1; + end_time = FFMAX(end_time, end_time1); } } if (st->duration != AV_NOPTS_VALUE) { duration1 = av_rescale_q(st->duration, st->time_base, AV_TIME_BASE_Q); - if (duration1 > duration) - duration = duration1; + duration = FFMAX(duration, duration1); } } if (start_time != INT64_MAX) { ic->start_time = start_time; - if (end_time != INT64_MIN) { - if (end_time - start_time > duration) - duration = end_time - start_time; - } + if (end_time != INT64_MIN) + duration = FFMAX(duration, end_time - start_time); } if (duration != INT64_MIN) { ic->duration = duration; @@ -2022,8 +2017,7 @@ static void estimate_timings(AVFormatContext *ic, int64_t old_offset) file_size = 0; } else { file_size = avio_size(ic->pb); - if (file_size < 0) - file_size = 0; + file_size = FFMAX(0, file_size); } if ((!strcmp(ic->iformat->name, "mpeg") || |