From f27a726809bf8e5e1fa24638bbd6e04afa1fcd36 Mon Sep 17 00:00:00 2001 From: =?utf8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Thu, 7 Dec 2006 00:47:37 +0000 Subject: [PATCH] use standard INT64_MAX instead of MAXINT64 (and MIN) Originally committed as revision 7241 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 2 +- libavformat/avformat.h | 8 -------- libavformat/utils.c | 8 ++++---- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index 6c3a65b..ae9af51 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -881,7 +881,7 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, } } - ti = MAXINT64; + ti = INT64_MAX; enc = ost->st->codec; if (enc->codec_type == CODEC_TYPE_VIDEO) { frame_number = ost->frame_number; diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 818d072..07d521c 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -39,14 +39,6 @@ extern "C" { /* packet functions */ -#ifndef MAXINT64 -#define MAXINT64 INT64_C(0x7fffffffffffffff) -#endif - -#ifndef MININT64 -#define MININT64 INT64_C(0x8000000000000000) -#endif - typedef struct AVPacket { int64_t pts; ///< presentation time stamp in time_base units int64_t dts; ///< decompression time stamp in time_base units diff --git a/libavformat/utils.c b/libavformat/utils.c index 55ed074..4c07a53 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1472,8 +1472,8 @@ static void av_update_stream_timings(AVFormatContext *ic) int i; AVStream *st; - start_time = MAXINT64; - end_time = MININT64; + start_time = INT64_MAX; + end_time = INT64_MIN; for(i = 0;i < ic->nb_streams; i++) { st = ic->streams[i]; if (st->start_time != AV_NOPTS_VALUE) { @@ -1488,9 +1488,9 @@ static void av_update_stream_timings(AVFormatContext *ic) } } } - if (start_time != MAXINT64) { + if (start_time != INT64_MAX) { ic->start_time = start_time; - if (end_time != MININT64) { + if (end_time != INT64_MIN) { ic->duration = end_time - start_time; if (ic->file_size > 0) { /* compute the bit rate */ -- 2.7.4