diff options
| author | Yaowu Xu <yaowu@google.com> | 2015-08-14 12:16:07 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2015-08-14 12:16:07 -0700 |
| commit | 72889a2a60926e1b3f9aa765707b0d369a1706ab (patch) | |
| tree | 08d7203a36bd8a22008f1e7df9047a69b2f326b5 /tools_common.c | |
| parent | 94ba3939cd9998105b3d18436d556531e65466bf (diff) | |
| download | libvpx-72889a2a60926e1b3f9aa765707b0d369a1706ab.tar libvpx-72889a2a60926e1b3f9aa765707b0d369a1706ab.tar.gz libvpx-72889a2a60926e1b3f9aa765707b0d369a1706ab.tar.bz2 libvpx-72889a2a60926e1b3f9aa765707b0d369a1706ab.zip | |
Remove vp10's build dependency on vp9
CONFIG_VP9_HIGHBITDEPTH is currently used by both vp9 and vp10, but in
many place outside vp9/vp10, the macro was used in conjunction of
CONFIG_VP9. This created a dependency on vp9 for vp10 to build. This
commit removes the dependency by use CONFIG_VP9_HIGHBITDEPTH only in
these places.
Change-Id: I8cc007fc9cf132394c6498ce6759e606b64a6ad0
Diffstat (limited to 'tools_common.c')
| -rw-r--r-- | tools_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools_common.c b/tools_common.c index 5c28037fc..77e6becd5 100644 --- a/tools_common.c +++ b/tools_common.c @@ -286,7 +286,7 @@ double sse_to_psnr(double samples, double peak, double sse) { } // TODO(debargha): Consolidate the functions below into a separate file. -#if CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH +#if CONFIG_VP9_HIGHBITDEPTH static void highbd_img_upshift(vpx_image_t *dst, vpx_image_t *src, int input_shift) { // Note the offset is 1 less than half. @@ -499,4 +499,4 @@ void vpx_img_downshift(vpx_image_t *dst, vpx_image_t *src, lowbd_img_downshift(dst, src, down_shift); } } -#endif // CONFIG_VP9 && CONFIG_VP9_HIGHBITDEPTH +#endif // CONFIG_VP9_HIGHBITDEPTH |