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/rdopt.c | |
| 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/rdopt.c')
| -rw-r--r-- | vp8/encoder/rdopt.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 5e61271a4..3d77bb35a 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -1051,7 +1051,6 @@ static unsigned int vp8_encode_inter_mb_segment(MACROBLOCK *x, int const *labels } - static const unsigned int segmentation_to_sseshift[4] = {3, 3, 2, 0}; |