[Ffmpeg-cvslog] r7241 - in trunk: ffmpeg.c libavformat/avformat.h libavformat/utils.c

[mru]

Author: mru
Date: Thu Dec  7 01:47:37 2006
New Revision: 7241

Modified:
   trunk/ffmpeg.c
   trunk/libavformat/avformat.h
   trunk/libavformat/utils.c

Log:
use standard INT64_MAX instead of MAXINT64 (and MIN)


Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	(original)
+++ trunk/ffmpeg.c	Thu Dec  7 01:47:37 2006
@@ -881,7 +881,7 @@
         }
     }
 
-    ti = MAXINT64;
+    ti = INT64_MAX;
     enc = ost->st->codec;
     if (enc->codec_type == CODEC_TYPE_VIDEO) {
         frame_number = ost->frame_number;

Modified: trunk/libavformat/avformat.h
==============================================================================
--- trunk/libavformat/avformat.h	(original)
+++ trunk/libavformat/avformat.h	Thu Dec  7 01:47:37 2006
@@ -39,14 +39,6 @@
 
 /* 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

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	(original)
+++ trunk/libavformat/utils.c	Thu Dec  7 01:47:37 2006
@@ -1472,8 +1472,8 @@
     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 @@
             }
         }
     }
-    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 */