diff options
| author | John Koleszar <jkoleszar@google.com> | 2010-10-26 20:01:54 -0700 |
|---|---|---|
| committer | Code Review <code-review@webmproject.org> | 2010-10-26 20:01:54 -0700 |
| commit | 9fdd90c9aa53400dd3afebb50a961ffa24e733fd (patch) | |
| tree | 2db61b69f46fd40be4f75e1c3226c2e0bfc581c6 /vp8/encoder/mcomp.c | |
| parent | 91d927f9b373ccf1f3f904530fbb0417f06a9429 (diff) | |
| parent | d330a5876b54d4e20fce1533d534affddffd71ea (diff) | |
| download | libvpx-9fdd90c9aa53400dd3afebb50a961ffa24e733fd.tar libvpx-9fdd90c9aa53400dd3afebb50a961ffa24e733fd.tar.gz libvpx-9fdd90c9aa53400dd3afebb50a961ffa24e733fd.tar.bz2 libvpx-9fdd90c9aa53400dd3afebb50a961ffa24e733fd.zip | |
Merge "arm: remove duplicate functions"
Diffstat (limited to 'vp8/encoder/mcomp.c')
| -rw-r--r-- | vp8/encoder/mcomp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vp8/encoder/mcomp.c b/vp8/encoder/mcomp.c index 4d60b92d6..850208eb8 100644 --- a/vp8/encoder/mcomp.c +++ b/vp8/encoder/mcomp.c @@ -1127,6 +1127,7 @@ int vp8_diamond_search_sadx4 } +#if !(CONFIG_REALTIME_ONLY) int vp8_full_search_sad(MACROBLOCK *x, BLOCK *b, BLOCKD *d, MV *ref_mv, int error_per_bit, int distance, vp8_variance_fn_ptr_t *fn_ptr, int *mvcost[2], int *mvsadcost[2]) { unsigned char *what = (*(b->base_src) + b->src); @@ -1339,6 +1340,8 @@ int vp8_full_search_sadx3(MACROBLOCK *x, BLOCK *b, BLOCKD *d, MV *ref_mv, int er else return INT_MAX; } +#endif + #ifdef ENTROPY_STATS void print_mode_context(void) |