diff options
| author | Sergey Ulanov <sergeyu@chromium.org> | 2014-04-09 18:47:00 -0700 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2014-04-10 08:54:30 -0700 |
| commit | 409f8da265275e81221aa568dd07f8409af01edd (patch) | |
| tree | 797a46c3386a76bdbc02f0016ed260da6a1d6c6f /vp8 | |
| parent | 81056e2d5e8d8efd2fa92fd2fdbd706e3482ed5d (diff) | |
| download | libvpx-409f8da265275e81221aa568dd07f8409af01edd.tar libvpx-409f8da265275e81221aa568dd07f8409af01edd.tar.gz libvpx-409f8da265275e81221aa568dd07f8409af01edd.tar.bz2 libvpx-409f8da265275e81221aa568dd07f8409af01edd.zip | |
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
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 3 |
1 files changed, 3 insertions, 0 deletions
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; |