Originally committed as revision 13948 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diego Biurrun authored on 2008/06/25 05:15:31... | ... |
@@ -32,6 +32,7 @@ |
32 | 32 |
#include <unistd.h> |
33 | 33 |
#include <math.h> |
34 | 34 |
|
35 |
+#include "libavutil/common.h" |
|
35 | 36 |
#include "dsputil.h" |
36 | 37 |
|
37 | 38 |
#include "simple_idct.h" |
... | ... |
@@ -39,10 +40,6 @@ |
39 | 39 |
#include "faanidct.h" |
40 | 40 |
#include "i386/idct_xvid.h" |
41 | 41 |
|
42 |
-#ifndef MAX |
|
43 |
-#define MAX(a, b) (((a) > (b)) ? (a) : (b)) |
|
44 |
-#endif |
|
45 |
- |
|
46 | 42 |
#undef printf |
47 | 43 |
#undef random |
48 | 44 |
|
... | ... |
@@ -288,7 +285,7 @@ void dct_error(const char *name, int is_idct, |
288 | 288 |
} |
289 | 289 |
#endif |
290 | 290 |
} |
291 |
- for(i=0; i<64; i++) sysErrMax= MAX(sysErrMax, FFABS(sysErr[i])); |
|
291 |
+ for(i=0; i<64; i++) sysErrMax= FFMAX(sysErrMax, FFABS(sysErr[i])); |
|
292 | 292 |
|
293 | 293 |
#if 1 // dump systematic errors |
294 | 294 |
for(i=0; i<64; i++){ |