diff options
| author | Yaowu Xu <yaowu@google.com> | 2011-07-21 16:05:24 +0000 |
|---|---|---|
| committer | On2 (Google) Code Review <on2-gerrit@google.com> | 2011-07-21 16:05:24 +0000 |
| commit | f6146612425ffc7523930e79ba43a253a7540693 (patch) | |
| tree | f54fc1ff4ae39ef7a7751ccc628da1504e1d6035 /vp8/common/entropy.h | |
| parent | a53586d9d1dfcdf49b418a453f2d69dd230b9088 (diff) | |
| parent | 8c31484ea1fbac128e31a951a004f6f91bc1ef2f (diff) | |
| download | libvpx-f6146612425ffc7523930e79ba43a253a7540693.tar libvpx-f6146612425ffc7523930e79ba43a253a7540693.tar.gz libvpx-f6146612425ffc7523930e79ba43a253a7540693.tar.bz2 libvpx-f6146612425ffc7523930e79ba43a253a7540693.zip | |
Merge "fix more merge issues" into experimental
Diffstat (limited to 'vp8/common/entropy.h')
| -rw-r--r-- | vp8/common/entropy.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vp8/common/entropy.h b/vp8/common/entropy.h index 786452712..d3e841c3e 100644 --- a/vp8/common/entropy.h +++ b/vp8/common/entropy.h @@ -50,8 +50,11 @@ extern vp8_extra_bit_struct vp8_extra_bits[12]; /* indexed by token value */ #define PROB_UPDATE_BASELINE_COST 7 #define MAX_PROB 255 +#if CONFIG_EXTEND_QRANGE #define DCT_MAX_VALUE 8192 - +#else +#define DCT_MAX_VALUE 2048 +#endif /* Coefficients are predicted via a 3-dimensional probability table. */ @@ -104,6 +107,6 @@ extern DECLARE_ALIGNED(64, const int, vp8_default_zig_zag1d_8x8[64]); extern short vp8_default_zig_zag_mask_8x8[64];//int64_t #endif extern const int vp8_mb_feature_data_bits[MB_LVL_MAX]; -void vp8_coef_tree_initialize(void); +void vp8_coef_tree_initialize(void); #endif |