From 409f8da265275e81221aa568dd07f8409af01edd Mon Sep 17 00:00:00 2001 From: Sergey Ulanov Date: Wed, 9 Apr 2014 18:47:00 -0700 Subject: Fix onyx_if.c to not to redefine M_LOG2_E if it's already defined. This fixes warning when compiling libvpx for PNaCl. PNaCl's version of math.h defines M_LOG2_E. Change-Id: Iba9450441538e9f82447ad2936bea94d21bafdf1 --- vp8/encoder/onyx_if.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'vp8') diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index ef37c0e37..32c599791 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -1761,8 +1761,11 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf) } +#ifndef M_LOG2_E #define M_LOG2_E 0.693147180559945309417 +#endif #define log2f(x) (log (x) / (float) M_LOG2_E) + static void cal_mvsadcosts(int *mvsadcost[2]) { int i = 1; -- cgit v1.2.3