diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2013-05-21 13:57:29 +0100 |
|---|---|---|
| committer | Paul Wilkins <paulwilkins@google.com> | 2013-05-22 11:23:31 +0100 |
| commit | 0b713f8c18f6695f882ad9a469ddba6842c3fa9e (patch) | |
| tree | 755cb46434146dc8822a738906de04e86d178176 /vp9/encoder/vp9_mcomp.c | |
| parent | ddf13be8ef7a9ab4c3b151b68de56da5ed9a069a (diff) | |
| download | libvpx-0b713f8c18f6695f882ad9a469ddba6842c3fa9e.tar libvpx-0b713f8c18f6695f882ad9a469ddba6842c3fa9e.tar.gz libvpx-0b713f8c18f6695f882ad9a469ddba6842c3fa9e.tar.bz2 libvpx-0b713f8c18f6695f882ad9a469ddba6842c3fa9e.zip | |
Merge CONFIG_COMP_INTER_JOINT_SEARCH.
Merge this experiment so that it is under a speed feature
flag not a configuration flag.
Change-Id: I536f7f125a4ff5149bb3a64f791e835c324535fd
Diffstat (limited to 'vp9/encoder/vp9_mcomp.c')
| -rw-r--r-- | vp9/encoder/vp9_mcomp.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_mcomp.c b/vp9/encoder/vp9_mcomp.c index 75e6e6757..2e99736ce 100644 --- a/vp9/encoder/vp9_mcomp.c +++ b/vp9/encoder/vp9_mcomp.c @@ -414,7 +414,6 @@ int vp9_find_best_sub_pixel_step_iteratively(MACROBLOCK *x, return besterr; } -#if CONFIG_COMP_INTER_JOINT_SEARCH #undef DIST /* returns subpixel variance error function */ #define DIST(r, c) \ @@ -606,7 +605,7 @@ int vp9_find_best_sub_pixel_comp(MACROBLOCK *x, return besterr; } -#endif // CONFIG_COMP_INTER_JOINT_SEARCH + #undef MVC #undef PRE @@ -2327,7 +2326,6 @@ int vp9_refining_search_sadx4(MACROBLOCK *x, return INT_MAX; } -#if CONFIG_COMP_INTER_JOINT_SEARCH /* This function is called when we do joint motion search in comp_inter_inter * mode. */ @@ -2429,4 +2427,3 @@ int vp9_refining_search_8p_c(MACROBLOCK *x, return INT_MAX; } } -#endif // CONFIG_COMP_INTER_JOINT_SEARCH |