Originally committed as revision 7241 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
| @@ -881,7 +881,7 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost, | |||||
| } | } | ||||
| } | } | ||||
| ti = MAXINT64; | |||||
| ti = INT64_MAX; | |||||
| enc = ost->st->codec; | enc = ost->st->codec; | ||||
| if (enc->codec_type == CODEC_TYPE_VIDEO) { | if (enc->codec_type == CODEC_TYPE_VIDEO) { | ||||
| frame_number = ost->frame_number; | frame_number = ost->frame_number; | ||||
| @@ -39,14 +39,6 @@ extern "C" { | |||||
| /* packet functions */ | /* packet functions */ | ||||
| #ifndef MAXINT64 | |||||
| #define MAXINT64 INT64_C(0x7fffffffffffffff) | |||||
| #endif | |||||
| #ifndef MININT64 | |||||
| #define MININT64 INT64_C(0x8000000000000000) | |||||
| #endif | |||||
| typedef struct AVPacket { | typedef struct AVPacket { | ||||
| int64_t pts; ///< presentation time stamp in time_base units | int64_t pts; ///< presentation time stamp in time_base units | ||||
| int64_t dts; ///< decompression time stamp in time_base units | int64_t dts; ///< decompression time stamp in time_base units | ||||
| @@ -1472,8 +1472,8 @@ static void av_update_stream_timings(AVFormatContext *ic) | |||||
| int i; | int i; | ||||
| AVStream *st; | AVStream *st; | ||||
| start_time = MAXINT64; | |||||
| end_time = MININT64; | |||||
| start_time = INT64_MAX; | |||||
| end_time = INT64_MIN; | |||||
| for(i = 0;i < ic->nb_streams; i++) { | for(i = 0;i < ic->nb_streams; i++) { | ||||
| st = ic->streams[i]; | st = ic->streams[i]; | ||||
| if (st->start_time != AV_NOPTS_VALUE) { | 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; | ic->start_time = start_time; | ||||
| if (end_time != MININT64) { | |||||
| if (end_time != INT64_MIN) { | |||||
| ic->duration = end_time - start_time; | ic->duration = end_time - start_time; | ||||
| if (ic->file_size > 0) { | if (ic->file_size > 0) { | ||||
| /* compute the bit rate */ | /* compute the bit rate */ | ||||