generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
John Koleszar
2014-04-10 15:24:25 -07:00
committed by Gerrit Code Review
parent 045e9f75ff 409f8da265
commit a5ce28a15a
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vp8/encoder/onyx_if.c
View File

@@ -1761,8 +1761,11 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf)
} }
#ifndef M_LOG2_E
#define M_LOG2_E 0.693147180559945309417 #define M_LOG2_E 0.693147180559945309417
#endif
#define log2f(x) (log (x) / (float) M_LOG2_E) #define log2f(x) (log (x) / (float) M_LOG2_E)
static void cal_mvsadcosts(int *mvsadcost[2]) static void cal_mvsadcosts(int *mvsadcost[2])
{ {
int i = 1; int i = 1;

2
vp9/encoder/vp9_onyx_if.c
View File

@@ -906,7 +906,9 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9_CONFIG *oxcf) {
cpi->ext_refresh_frame_context_pending = 0; cpi->ext_refresh_frame_context_pending = 0;
} }
#ifndef M_LOG2_E
#define M_LOG2_E 0.693147180559945309417 #define M_LOG2_E 0.693147180559945309417
#endif
#define log2f(x) (log (x) / (float) M_LOG2_E) #define log2f(x) (log (x) / (float) M_LOG2_E)
static void cal_nmvjointsadcost(int *mvjointsadcost) { static void cal_nmvjointsadcost(int *mvjointsadcost) {