diff options
Diffstat (limited to 'vp8/common/blockd.h')
| -rw-r--r-- | vp8/common/blockd.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h index 91e90e2a6..b237206e6 100644 --- a/vp8/common/blockd.h +++ b/vp8/common/blockd.h @@ -21,9 +21,6 @@ void vpx_log(const char *format, ...); #include "subpixel.h" #include "vpx_ports/mem.h" -#define TRUE 1 -#define FALSE 0 - /*#define DCPRED 1*/ #define DCPREDSIMTHRESH 0 #define DCPREDCNTTHRESH 3 @@ -187,7 +184,6 @@ typedef struct short *qcoeff; short *dqcoeff; unsigned char *predictor; - short *diff; short *dequant; /* 16 Y blocks, 4 U blocks, 4 V blocks each with 16 entries */ @@ -206,12 +202,16 @@ typedef struct typedef struct MacroBlockD { - DECLARE_ALIGNED(16, short, diff[400]); /* from idct diff */ DECLARE_ALIGNED(16, unsigned char, predictor[384]); DECLARE_ALIGNED(16, short, qcoeff[400]); DECLARE_ALIGNED(16, short, dqcoeff[400]); DECLARE_ALIGNED(16, char, eobs[25]); + DECLARE_ALIGNED(16, short, dequant_y1[16]); + DECLARE_ALIGNED(16, short, dequant_y1_dc[16]); + DECLARE_ALIGNED(16, short, dequant_y2[16]); + DECLARE_ALIGNED(16, short, dequant_uv[16]); + /* 16 Y blocks, 4 U, 4 V, 1 DC 2nd order block, each with 16 entries. */ BLOCKD block[25]; int fullpixel_mask; |