From a0d7105dc4ba7aee4295947fcd565f9fed20c33f Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Fri, 14 May 2010 15:12:25 +0000 Subject: [PATCH] fix win32 compile --- contrib/mpeg_encode/combine.cpp | 8 ++++---- contrib/mpeg_encode/headers/byteorder.h | 1 - contrib/mpeg_encode/iframe.cpp | 15 +-------------- contrib/mpeg_encode/mpeg.cpp | 2 +- contrib/mpeg_encode/rate.cpp | 1 - 5 files changed, 6 insertions(+), 21 deletions(-) diff --git a/contrib/mpeg_encode/combine.cpp b/contrib/mpeg_encode/combine.cpp index 3ce6bda17b..75c18e6037 100644 --- a/contrib/mpeg_encode/combine.cpp +++ b/contrib/mpeg_encode/combine.cpp @@ -166,7 +166,7 @@ GOPStoMPEG(int numGOPS, fprintf(stderr, "ERROR: Couldn't read (GOPStoMPEG): %s retry %d\n", fileName, q); fflush(stderr); - sleep(1); + //sleep(1); } if (q == READ_ATTEMPTS) { throw "Giving up"; @@ -314,7 +314,7 @@ FramesToMPEG(int numFrames, if ( (inputFile = fopen(fileName, "rb")) != NULL ) break; fprintf(stderr, "ERROR: Couldn't read 2: %s retry %d\n", fileName, q); fflush(stderr); - sleep(1); + //sleep(1); } if (q == READ_ATTEMPTS) { throw "Giving up"; @@ -347,7 +347,7 @@ FramesToMPEG(int numFrames, fprintf(stderr, "ERROR: Couldn't read (bNum=%d): %s retry %d\n", bNum, fileName, q); fflush(stderr); - sleep(1); + //sleep(1); } if (q == READ_ATTEMPTS) { throw "Giving up"; @@ -429,7 +429,7 @@ FramesToMPEG(int numFrames, fprintf(stderr, "ERROR: Couldn't read (FramestoMPEG): %s retry %d\n", fileName, q); fflush(stderr); - sleep(1); + //sleep(1); } if (q == READ_ATTEMPTS) { throw "Giving up"; diff --git a/contrib/mpeg_encode/headers/byteorder.h b/contrib/mpeg_encode/headers/byteorder.h index e3f2047403..ac97874eb8 100644 --- a/contrib/mpeg_encode/headers/byteorder.h +++ b/contrib/mpeg_encode/headers/byteorder.h @@ -72,6 +72,5 @@ #else /* let in.h handle it, if possible */ #include <sys/types.h> -#include <netinet/in.h> #endif /* FORCE_LITTLE_ENDIAN */ #endif /* FORCE_BIG_ENDIAN */ diff --git a/contrib/mpeg_encode/iframe.cpp b/contrib/mpeg_encode/iframe.cpp index 9dea8da463..8fc7a7413d 100644 --- a/contrib/mpeg_encode/iframe.cpp +++ b/contrib/mpeg_encode/iframe.cpp @@ -137,12 +137,7 @@ *==============*/ -#ifdef CLOCKS_PER_SEC -#include <times.h> -#else -#include <sys/times.h> -#endif - +#include <time.h> #include <sys/param.h> #include "all.h" #include "mtypes.h" @@ -1057,16 +1052,8 @@ AllocDctBlocks() *======================================================================*/ int32 time_elapsed() { -#ifdef CLOCKS_PER_SEC - /* ANSI C */ TIME_RATE = CLOCKS_PER_SEC; return (int32) clock(); -#else - struct tms timeBuffer; - TIME_RATE = 60; - times(&timeBuffer); - return timeBuffer.tms_utime + timeBuffer.tms_stime; -#endif } diff --git a/contrib/mpeg_encode/mpeg.cpp b/contrib/mpeg_encode/mpeg.cpp index cb548e6cb3..8cb53a2b8f 100644 --- a/contrib/mpeg_encode/mpeg.cpp +++ b/contrib/mpeg_encode/mpeg.cpp @@ -1577,7 +1577,7 @@ ReadDecodedRefFrame(MpegFrame *frame, } if ((fpointer = fopen(fileName, "rb")) == NULL) { - sleep(1); + //sleep(1); if ((fpointer = fopen(fileName, "rb")) == NULL) { throw "Cannot open file"; }} diff --git a/contrib/mpeg_encode/rate.cpp b/contrib/mpeg_encode/rate.cpp index 27d9176d35..7ef7ffd0d4 100644 --- a/contrib/mpeg_encode/rate.cpp +++ b/contrib/mpeg_encode/rate.cpp @@ -48,7 +48,6 @@ * HEADER FILES * *==============*/ -#include <sys/times.h> #include "all.h" #include "mtypes.h" #include "bitio.h" -- GitLab