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/encoder/rdopt.c | |
| 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/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}; |