Commit 3d7e2677 authored by James Zern's avatar James Zern Committed by Gerrit Code Review
Browse files

Merge changes I05b3028a,I1ad41c09

* changes:
  vpx_dsp_common.h: remove circular include
  vpx_dsp_common.h: fix include guard
parents f3864874 4f69f741
...@@ -8,12 +8,11 @@ ...@@ -8,12 +8,11 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef VPX_DSP_COMMON_H_ #ifndef VPX_DSP_VPX_DSP_COMMON_H_
#define VPX_DSP_COMMON_H_ #define VPX_DSP_VPX_DSP_COMMON_H_
#include "./vpx_config.h" #include "./vpx_config.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#ifdef __cplusplus #ifdef __cplusplus
...@@ -67,4 +66,4 @@ static INLINE uint16_t clip_pixel_highbd(int val, int bd) { ...@@ -67,4 +66,4 @@ static INLINE uint16_t clip_pixel_highbd(int val, int bd) {
} // extern "C" } // extern "C"
#endif #endif
#endif // VPX_DSP_COMMON_H_ #endif // VPX_DSP_VPX_DSP_COMMON_H_
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment