diff options
| author | John Koleszar <jkoleszar@google.com> | 2014-04-10 15:24:25 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-04-10 15:24:25 -0700 |
| commit | a5ce28a15a95be43d07225e38509baf0ecd963cb (patch) | |
| tree | 1ede6e634e87dde0ace3c0b6a235d49da0014eb8 /vp9 | |
| parent | 045e9f75ff5eb4ec1e0c2c3cd923db92bc060f60 (diff) | |
| parent | 409f8da265275e81221aa568dd07f8409af01edd (diff) | |
| download | libvpx-a5ce28a15a95be43d07225e38509baf0ecd963cb.tar libvpx-a5ce28a15a95be43d07225e38509baf0ecd963cb.tar.gz libvpx-a5ce28a15a95be43d07225e38509baf0ecd963cb.tar.bz2 libvpx-a5ce28a15a95be43d07225e38509baf0ecd963cb.zip | |
Merge "Fix onyx_if.c to not to redefine M_LOG2_E if it's already defined."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 0ac9d5f05..2f1381476 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -906,7 +906,9 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9_CONFIG *oxcf) { 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) { |