diff options
| author | Yaowu Xu <yaowu@google.com> | 2011-05-26 09:39:41 -0700 |
|---|---|---|
| committer | Code Review <code-review@webmproject.org> | 2011-05-26 09:39:41 -0700 |
| commit | 9a248f15938ed63b8df4cdaf2392411108a83632 (patch) | |
| tree | 4e430a7425b446f9127905844c8010152261063a /vp8/encoder/mcomp.h | |
| parent | 40b850b4586189ab075f3123ec4f8f303667634f (diff) | |
| parent | d8c525b8b1726dc1de18d7e729140592eb3d0b16 (diff) | |
| download | libvpx-9a248f15938ed63b8df4cdaf2392411108a83632.tar libvpx-9a248f15938ed63b8df4cdaf2392411108a83632.tar.gz libvpx-9a248f15938ed63b8df4cdaf2392411108a83632.tar.bz2 libvpx-9a248f15938ed63b8df4cdaf2392411108a83632.zip | |
Merge "fix the mix use of errorperbit and sadperbit"
Diffstat (limited to 'vp8/encoder/mcomp.h')
| -rw-r--r-- | vp8/encoder/mcomp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp8/encoder/mcomp.h b/vp8/encoder/mcomp.h index 85c7513ec..bf9fa6f76 100644 --- a/vp8/encoder/mcomp.h +++ b/vp8/encoder/mcomp.h @@ -63,7 +63,7 @@ extern fractional_mv_step_fp vp8_skip_fractional_mv_step; BLOCK *b, \ BLOCKD *d, \ int_mv *ref_mv, \ - int error_per_bit, \ + int sad_per_bit, \ int distance, \ vp8_variance_fn_ptr_t *fn_ptr, \ int *mvcost[2], \ @@ -77,7 +77,7 @@ extern fractional_mv_step_fp vp8_skip_fractional_mv_step; BLOCK *b, \ BLOCKD *d, \ int_mv *ref_mv, \ - int error_per_bit, \ + int sad_per_bit, \ int distance, \ vp8_variance_fn_ptr_t *fn_ptr, \ int *mvcost[2], \ @@ -93,7 +93,7 @@ extern fractional_mv_step_fp vp8_skip_fractional_mv_step; int_mv *ref_mv, \ int_mv *best_mv, \ int search_param, \ - int error_per_bit, \ + int sad_per_bit, \ int *num00, \ vp8_variance_fn_ptr_t *fn_ptr, \ int *mvcost[2], \ |