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/encoder/quantize.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/encoder/quantize.h')
| -rw-r--r-- | vp8/encoder/quantize.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/vp8/encoder/quantize.h b/vp8/encoder/quantize.h index a6a6078b0..1a2bad667 100644 --- a/vp8/encoder/quantize.h +++ b/vp8/encoder/quantize.h @@ -45,7 +45,7 @@ extern prototype_quantize_block_pair(vp8_quantize_quantb_pair); #define vp8_quantize_fastquantb vp8_fast_quantize_b_c #endif extern prototype_quantize_block(vp8_quantize_fastquantb); - +#if CONFIG_T8X8 #ifndef vp8_quantize_quantb_8x8 #define vp8_quantize_quantb_8x8 vp8_regular_quantize_b_8x8 #endif @@ -65,7 +65,7 @@ extern prototype_quantize_block(vp8_quantize_quantb_2x2); #define vp8_quantize_fastquantb_2x2 vp8_fast_quantize_b_2x2_c #endif extern prototype_quantize_block(vp8_quantize_fastquantb_2x2); - +#endif #ifndef vp8_quantize_fastquantb_pair #define vp8_quantize_fastquantb_pair vp8_fast_quantize_b_pair_c @@ -77,10 +77,12 @@ typedef struct prototype_quantize_block(*quantb); prototype_quantize_block_pair(*quantb_pair); prototype_quantize_block(*fastquantb); +#if CONFIG_T8X8 prototype_quantize_block(*quantb_8x8); prototype_quantize_block(*fastquantb_8x8); prototype_quantize_block(*quantb_2x2); prototype_quantize_block(*fastquantb_2x2); +#endif prototype_quantize_block_pair(*fastquantb_pair); } vp8_quantize_rtcd_vtable_t; @@ -106,9 +108,10 @@ extern prototype_quantize_mb(vp8_quantize_mby); #endif extern void vp8_strict_quantize_b(BLOCK *b,BLOCKD *d); +#if CONFIG_T8X8 extern void vp8_strict_quantize_b_8x8(BLOCK *b,BLOCKD *d); extern void vp8_strict_quantize_b_2x2(BLOCK *b,BLOCKD *d); - +#endif struct VP8_COMP; extern void vp8_set_quantizer(struct VP8_COMP *cpi, int Q); extern void vp8cx_frame_init_quantizer(struct VP8_COMP *cpi); |