Cleanup:

- TIMEING && MORE_TIMEING disabled by default
- private stuff moved to postprocess.c to avoid possible conflicts


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2190 b3059339-0415-0410-9bf9-f77b7e298cf2

3 files changed, 26 insertions, 15 deletions

diff --git a/postproc/postprocess.c b/postproc/postprocess.c
index 8e317dc6ab..5c13e53f19 100644
--- a/postproc/postprocess.c
+++ b/postproc/postprocess.c
@@ -90,6 +90,16 @@ Changelog: use the CVS log
 //#undef HAVE_MMX
 #include "postprocess.h"
 
+#define MIN(a,b) ((a) > (b) ? (b) : (a))
+#define MAX(a,b) ((a) < (b) ? (b) : (a))
+#define ABS(a) ((a) > 0 ? (a) : (-(a)))
+#define SIGN(a) ((a) > 0 ? 1 : -1)
+
+#ifdef HAVE_MMX2
+#define PAVGB(a,b) "pavgb " #a ", " #b " \n\t"
+#elif defined (HAVE_3DNOW)
+#define PAVGB(a,b) "pavgusb " #a ", " #b " \n\t"
+#endif
 
 static uint64_t packedYOffset=	0x0000000000000000LL;
 static uint64_t packedYScale=	0x0100010001000100LL;
diff --git a/postproc/postprocess.h b/postproc/postprocess.h
index 63277e8c69..81f5435b40 100644
--- a/postproc/postprocess.h
+++ b/postproc/postprocess.h
@@ -46,23 +46,13 @@
 #define H_RK1_FILTER	0x1000			// 4096
 #define H_X1_FILTER	0x2000			// 8192
 
+#define GET_PP_QUALITY_MAX 6
 
-#define TIMEING
-#define MORE_TIMEING
-
-#define MIN(a,b) ((a) > (b) ? (b) : (a))
-#define MAX(a,b) ((a) < (b) ? (b) : (a))
-#define ABS(a) ((a) > 0 ? (a) : (-(a)))
-#define SIGN(a) ((a) > 0 ? 1 : -1)
+//#define TIMEING
+//#define MORE_TIMEING
 
 #define QP_STORE_T int
 
-#ifdef HAVE_MMX2
-#define PAVGB(a,b) "pavgb " #a ", " #b " \n\t"
-#elif defined (HAVE_3DNOW)
-#define PAVGB(a,b) "pavgusb " #a ", " #b " \n\t"
-#endif
-
 //#ifdef __cplusplus
 //#include <inttypes.h>
 
@@ -74,15 +64,16 @@
 //extern "C"
 //{
 //#endif
+
 void postprocess(unsigned char * src[], int src_stride,
                  unsigned char * dst[], int dst_stride,
                  int horizontal_size,   int vertical_size,
                  QP_STORE_T *QP_store,  int QP_stride, int mode);
+
 int getPpModeForQuality(int quality);
+
 //#ifdef __cplusplus
 //}
 //#endif
 
-#define GET_PP_QUALITY_MAX 6
-
 #endif
diff --git a/postproc/postprocess_template.c b/postproc/postprocess_template.c
index 8e317dc6ab..5c13e53f19 100644
--- a/postproc/postprocess_template.c
+++ b/postproc/postprocess_template.c
@@ -90,6 +90,16 @@ Changelog: use the CVS log
 //#undef HAVE_MMX
 #include "postprocess.h"
 
+#define MIN(a,b) ((a) > (b) ? (b) : (a))
+#define MAX(a,b) ((a) < (b) ? (b) : (a))
+#define ABS(a) ((a) > 0 ? (a) : (-(a)))
+#define SIGN(a) ((a) > 0 ? 1 : -1)
+
+#ifdef HAVE_MMX2
+#define PAVGB(a,b) "pavgb " #a ", " #b " \n\t"
+#elif defined (HAVE_3DNOW)
+#define PAVGB(a,b) "pavgusb " #a ", " #b " \n\t"
+#endif
 
 static uint64_t packedYOffset=	0x0000000000000000LL;
 static uint64_t packedYScale=	0x0100010001000100LL;