shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix onyx_if.c to not to redefine M_LOG2_E if it's already defined."

--- a/vp8/encoder/onyx_if.c

+++ b/vp8/encoder/onyx_if.c

@@ -1761,8 +1761,11 @@

 }

+#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;

--- a/vp9/encoder/vp9_onyx_if.c

+++ b/vp9/encoder/vp9_onyx_if.c

@@ -906,7 +906,9 @@

   cpi->ext_refresh_frame_context_pending = 0;

 }

+#ifndef M_LOG2_E

 #define M_LOG2_E 0.693147180559945309417

+#endif

 #define log2f(x) (log (x) / (float) M_LOG2_E)

 static void cal_nmvjointsadcost(int *mvjointsadcost) {