Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

use standard INT64_MAX instead of MAXINT64 (and MIN)

Browse source 
Originally committed as revision 7241 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2006-12-07 00:47:37 +00:00
parent 8da9266cea
commit f27a726809
3 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ffmpeg.c
View file

@ -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;

8
libavformat/avformat.h
View file

@ -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

8
libavformat/utils.c
View file

@ -1472,8 +1472,8 @@ static void av_update_stream_timings(AVFormatContext *ic)
int i; int i;
AVStream *st; AVStream *st;
start_time = MAXINT64; start_time = INT64_MAX;
end_time = MININT64; 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 */