diff options
| author | Yaowu Xu <yaowu@google.com> | 2011-07-20 14:21:24 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2011-07-21 09:01:53 -0700 |
| commit | 8c31484ea1fbac128e31a951a004f6f91bc1ef2f (patch) | |
| tree | b99e86871914df1d57717d07b694eb7837d29ae3 /vp8/common/coefupdateprobs.h | |
| parent | 1c24eb2b7b3a61893ea19e9e544c24a233f89921 (diff) | |
| download | libvpx-8c31484ea1fbac128e31a951a004f6f91bc1ef2f.tar libvpx-8c31484ea1fbac128e31a951a004f6f91bc1ef2f.tar.gz libvpx-8c31484ea1fbac128e31a951a004f6f91bc1ef2f.tar.bz2 libvpx-8c31484ea1fbac128e31a951a004f6f91bc1ef2f.zip | |
fix more merge issues
With this fix, the experimental branch now builds and encodes correctly
with the following two configure options respectively:
--enable-experimental --enable-t8x8
--enable-experimental
Change-Id: I3147c33c503fe713a85fd371e4f1a974805778bf
Diffstat (limited to 'vp8/common/coefupdateprobs.h')
| -rw-r--r-- | vp8/common/coefupdateprobs.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vp8/common/coefupdateprobs.h b/vp8/common/coefupdateprobs.h index 029941440..6fe5fcc6f 100644 --- a/vp8/common/coefupdateprobs.h +++ b/vp8/common/coefupdateprobs.h @@ -183,8 +183,11 @@ const vp8_prob vp8_coef_update_probs [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTE }, }, }; - -const vp8_prob vp8_coef_update_probs_8x8 [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_CONTEXTS] [ENTROPY_NODES] = +#if CONFIG_T8X8 +const vp8_prob vp8_coef_update_probs_8x8 [BLOCK_TYPES] + [COEF_BANDS] + [PREV_COEF_CONTEXTS] + [ENTROPY_NODES] = { { { @@ -356,3 +359,4 @@ const vp8_prob vp8_coef_update_probs_8x8 [BLOCK_TYPES] [COEF_BANDS] [PREV_COEF_C }, }; +#endif
\ No newline at end of file |