Mercurial > libavcodec.hg
comparison dct-test.c @ 7130:601509a430f7 libavcodec
Replace redundant MAX macro declaration by proper use of FFMAX.
author | diego |
---|---|
date | Tue, 24 Jun 2008 20:15:31 +0000 |
parents | 65e7e714c770 |
children | 6bd6a2da306e |
comparison
equal
deleted
inserted
replaced
7129:322023e630a6 | 7130:601509a430f7 |
---|---|
30 #include <string.h> | 30 #include <string.h> |
31 #include <sys/time.h> | 31 #include <sys/time.h> |
32 #include <unistd.h> | 32 #include <unistd.h> |
33 #include <math.h> | 33 #include <math.h> |
34 | 34 |
35 #include "libavutil/common.h" | |
35 #include "dsputil.h" | 36 #include "dsputil.h" |
36 | 37 |
37 #include "simple_idct.h" | 38 #include "simple_idct.h" |
38 #include "faandct.h" | 39 #include "faandct.h" |
39 #include "faanidct.h" | 40 #include "faanidct.h" |
40 #include "i386/idct_xvid.h" | 41 #include "i386/idct_xvid.h" |
41 | |
42 #ifndef MAX | |
43 #define MAX(a, b) (((a) > (b)) ? (a) : (b)) | |
44 #endif | |
45 | 42 |
46 #undef printf | 43 #undef printf |
47 #undef random | 44 #undef random |
48 | 45 |
49 void *fast_memcpy(void *a, const void *b, size_t c){return memcpy(a,b,c);}; | 46 void *fast_memcpy(void *a, const void *b, size_t c){return memcpy(a,b,c);}; |
286 printf("%4d ", block[i] - block1[i]); | 283 printf("%4d ", block[i] - block1[i]); |
287 } | 284 } |
288 } | 285 } |
289 #endif | 286 #endif |
290 } | 287 } |
291 for(i=0; i<64; i++) sysErrMax= MAX(sysErrMax, FFABS(sysErr[i])); | 288 for(i=0; i<64; i++) sysErrMax= FFMAX(sysErrMax, FFABS(sysErr[i])); |
292 | 289 |
293 #if 1 // dump systematic errors | 290 #if 1 // dump systematic errors |
294 for(i=0; i<64; i++){ | 291 for(i=0; i<64; i++){ |
295 if(i%8==0) printf("\n"); | 292 if(i%8==0) printf("\n"); |
296 printf("%5d ", (int)sysErr[i]); | 293 printf("%5d ", (int)sysErr[i]); |