diff --git a/contrib/mpeg_encode/headers/general.h b/contrib/mpeg_encode/headers/general.h index a4782c897bc3540a263202bf12914178cdde20dc..f78dfd2af454feebe6b7b1bb4f7eff486335c3ea 100644 --- a/contrib/mpeg_encode/headers/general.h +++ b/contrib/mpeg_encode/headers/general.h @@ -149,8 +149,8 @@ typedef int int32; #define max(a,b) ((a) > (b) ? (a) : (b)) #undef min #define min(a,b) ((a) < (b) ? (a) : (b)) -#undef abs -#define abs(a) ((a) >= 0 ? (a) : -(a)) +//#undef abs +//#define abs(a) ((a) >= 0 ? (a) : -(a)) #endif diff --git a/contrib/mpeg_encode/pframe.cpp b/contrib/mpeg_encode/pframe.cpp index bd51ddc8bbd9db89eff591413e0c3139a1dd6108..37ccb98cfb21100226541ccce4d6b03a7ebdcc7c 100644 --- a/contrib/mpeg_encode/pframe.cpp +++ b/contrib/mpeg_encode/pframe.cpp @@ -126,7 +126,7 @@ *==============*/ #include <assert.h> -#include <sys/param.h> +//#include <sys/param.h> #include "all.h" #include "mtypes.h" #include "bitio.h" diff --git a/contrib/mpeg_encode/readframe.cpp b/contrib/mpeg_encode/readframe.cpp index de71b9967ffd9214510141314346ae4e7d20ceb5..3eabffadad296072c26d660a6ecdb2ef056a92a5 100644 --- a/contrib/mpeg_encode/readframe.cpp +++ b/contrib/mpeg_encode/readframe.cpp @@ -124,7 +124,7 @@ #include <errno.h> #include <ctype.h> #include <string.h> -#include <unistd.h> +//#include <unistd.h> #include "mtypes.h" #include "frames.h" #include "prototypes.h"