shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "cosmetics: normalize include guards"

--- a/args.h

+++ b/args.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef ARGS_H_

-#define ARGS_H_

+#ifndef VPX_ARGS_H_

+#define VPX_ARGS_H_

 #include <stdio.h>

 #ifdef __cplusplus

@@ -60,4 +60,4 @@

 }  // extern "C"

 #endif

-#endif  // ARGS_H_

+#endif  // VPX_ARGS_H_

--- a/examples/svc_context.h

+++ b/examples/svc_context.h

@@ -13,8 +13,8 @@

  * spatial SVC frame

  */

-#ifndef VPX_SVC_CONTEXT_H_

-#define VPX_SVC_CONTEXT_H_

+#ifndef VPX_EXAMPLES_SVC_CONTEXT_H_

+#define VPX_EXAMPLES_SVC_CONTEXT_H_

 #include "vpx/vp8cx.h"

 #include "vpx/vpx_encoder.h"

@@ -109,4 +109,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_SVC_CONTEXT_H_

+#endif  // VPX_EXAMPLES_SVC_CONTEXT_H_

--- a/ivfdec.h

+++ b/ivfdec.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef IVFDEC_H_

-#define IVFDEC_H_

+#ifndef VPX_IVFDEC_H_

+#define VPX_IVFDEC_H_

 #include "./tools_common.h"

@@ -25,4 +25,4 @@

 } /* extern "C" */

 #endif

-#endif  // IVFDEC_H_

+#endif  // VPX_IVFDEC_H_

--- a/ivfenc.h

+++ b/ivfenc.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef IVFENC_H_

-#define IVFENC_H_

+#ifndef VPX_IVFENC_H_

+#define VPX_IVFENC_H_

 #include "./tools_common.h"

@@ -30,4 +30,4 @@

 } /* extern "C" */

 #endif

-#endif  // IVFENC_H_

+#endif  // VPX_IVFENC_H_

--- a/md5_utils.h

+++ b/md5_utils.h

@@ -20,8 +20,8 @@

  * Still in the public domain.

  */

-#ifndef MD5_UTILS_H_

-#define MD5_UTILS_H_

+#ifndef VPX_MD5_UTILS_H_

+#define VPX_MD5_UTILS_H_

 #ifdef __cplusplus

 extern "C" {

@@ -46,4 +46,4 @@

 }  // extern "C"

 #endif

-#endif  // MD5_UTILS_H_

+#endif  // VPX_MD5_UTILS_H_

--- a/rate_hist.h

+++ b/rate_hist.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef RATE_HIST_H_

-#define RATE_HIST_H_

+#ifndef VPX_RATE_HIST_H_

+#define VPX_RATE_HIST_H_

 #include "vpx/vpx_encoder.h"

@@ -37,4 +37,4 @@

 }  // extern "C"

 #endif

-#endif  // RATE_HIST_H_

+#endif  // VPX_RATE_HIST_H_

--- a/test/acm_random.h

+++ b/test/acm_random.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef TEST_ACM_RANDOM_H_

-#define TEST_ACM_RANDOM_H_

+#ifndef VPX_TEST_ACM_RANDOM_H_

+#define VPX_TEST_ACM_RANDOM_H_

 #include <assert.h>

@@ -73,4 +73,4 @@

 }  // namespace libvpx_test

-#endif  // TEST_ACM_RANDOM_H_

+#endif  // VPX_TEST_ACM_RANDOM_H_

--- a/test/bench.h

+++ b/test/bench.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef TEST_BENCH_H_

-#define TEST_BENCH_H_

+#ifndef VPX_TEST_BENCH_H_

+#define VPX_TEST_BENCH_H_

 // Number of iterations used to compute median run time.

 #define VPX_BENCH_ROBUST_ITER 15

@@ -27,4 +27,4 @@

   int times_[VPX_BENCH_ROBUST_ITER];

 };

-#endif  // TEST_BENCH_H_

+#endif  // VPX_TEST_BENCH_H_

--- a/test/buffer.h

+++ b/test/buffer.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef TEST_BUFFER_H_

-#define TEST_BUFFER_H_

+#ifndef VPX_TEST_BUFFER_H_

+#define VPX_TEST_BUFFER_H_

 #include <stdio.h>

@@ -379,4 +379,4 @@

   return true;

 }

 }  // namespace libvpx_test

-#endif  // TEST_BUFFER_H_

+#endif  // VPX_TEST_BUFFER_H_

--- a/test/clear_system_state.h

+++ b/test/clear_system_state.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef TEST_CLEAR_SYSTEM_STATE_H_

-#define TEST_CLEAR_SYSTEM_STATE_H_

+#ifndef VPX_TEST_CLEAR_SYSTEM_STATE_H_

+#define VPX_TEST_CLEAR_SYSTEM_STATE_H_

 #include "./vpx_config.h"

 #include "vpx_ports/system_state.h"

@@ -20,4 +20,4 @@

 inline void ClearSystemState() { vpx_clear_system_state(); }

 }  // namespace libvpx_test

-#endif  // TEST_CLEAR_SYSTEM_STATE_H_

+#endif  // VPX_TEST_CLEAR_SYSTEM_STATE_H_

--- a/test/codec_factory.h

+++ b/test/codec_factory.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef TEST_CODEC_FACTORY_H_

-#define TEST_CODEC_FACTORY_H_

+#ifndef VPX_TEST_CODEC_FACTORY_H_

+#define VPX_TEST_CODEC_FACTORY_H_

 #include "./vpx_config.h"

 #include "vpx/vpx_decoder.h"

@@ -263,4 +263,4 @@

 #endif  // CONFIG_VP9

 }  // namespace libvpx_test

-#endif  // TEST_CODEC_FACTORY_H_

+#endif  // VPX_TEST_CODEC_FACTORY_H_

--- a/test/decode_test_driver.h

+++ b/test/decode_test_driver.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef TEST_DECODE_TEST_DRIVER_H_

-#define TEST_DECODE_TEST_DRIVER_H_

+#ifndef VPX_TEST_DECODE_TEST_DRIVER_H_

+#define VPX_TEST_DECODE_TEST_DRIVER_H_

 #include <cstring>

 #include "third_party/googletest/src/include/gtest/gtest.h"

 #include "./vpx_config.h"

@@ -159,4 +159,4 @@

 }  // namespace libvpx_test

-#endif  // TEST_DECODE_TEST_DRIVER_H_

+#endif  // VPX_TEST_DECODE_TEST_DRIVER_H_

--- a/test/encode_test_driver.h

+++ b/test/encode_test_driver.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef TEST_ENCODE_TEST_DRIVER_H_

-#define TEST_ENCODE_TEST_DRIVER_H_

+#ifndef VPX_TEST_ENCODE_TEST_DRIVER_H_

+#define VPX_TEST_ENCODE_TEST_DRIVER_H_

 #include <string>

 #include <vector>

@@ -289,4 +289,4 @@

 }  // namespace libvpx_test

-#endif  // TEST_ENCODE_TEST_DRIVER_H_

+#endif  // VPX_TEST_ENCODE_TEST_DRIVER_H_

--- a/test/i420_video_source.h

+++ b/test/i420_video_source.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef TEST_I420_VIDEO_SOURCE_H_

-#define TEST_I420_VIDEO_SOURCE_H_

+#ifndef VPX_TEST_I420_VIDEO_SOURCE_H_

+#define VPX_TEST_I420_VIDEO_SOURCE_H_

 #include <cstdio>

 #include <cstdlib>

 #include <string>

@@ -30,4 +30,4 @@

 }  // namespace libvpx_test

-#endif  // TEST_I420_VIDEO_SOURCE_H_

+#endif  // VPX_TEST_I420_VIDEO_SOURCE_H_

--- a/test/ivf_video_source.h

+++ b/test/ivf_video_source.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef TEST_IVF_VIDEO_SOURCE_H_

-#define TEST_IVF_VIDEO_SOURCE_H_

+#ifndef VPX_TEST_IVF_VIDEO_SOURCE_H_

+#define VPX_TEST_IVF_VIDEO_SOURCE_H_

 #include <cstdio>

 #include <cstdlib>

 #include <new>

@@ -103,4 +103,4 @@

 }  // namespace libvpx_test

-#endif  // TEST_IVF_VIDEO_SOURCE_H_

+#endif  // VPX_TEST_IVF_VIDEO_SOURCE_H_

--- a/test/md5_helper.h

+++ b/test/md5_helper.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef TEST_MD5_HELPER_H_

-#define TEST_MD5_HELPER_H_

+#ifndef VPX_TEST_MD5_HELPER_H_

+#define VPX_TEST_MD5_HELPER_H_

 #include "./md5_utils.h"

 #include "vpx/vpx_decoder.h"

@@ -72,4 +72,4 @@

 }  // namespace libvpx_test

-#endif  // TEST_MD5_HELPER_H_

+#endif  // VPX_TEST_MD5_HELPER_H_

--- a/test/register_state_check.h

+++ b/test/register_state_check.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef TEST_REGISTER_STATE_CHECK_H_

-#define TEST_REGISTER_STATE_CHECK_H_

+#ifndef VPX_TEST_REGISTER_STATE_CHECK_H_

+#define VPX_TEST_REGISTER_STATE_CHECK_H_

 #include "third_party/googletest/src/include/gtest/gtest.h"

 #include "./vpx_config.h"

@@ -184,4 +184,4 @@

 #define API_REGISTER_STATE_CHECK ASM_REGISTER_STATE_CHECK

 #endif

-#endif  // TEST_REGISTER_STATE_CHECK_H_

+#endif  // VPX_TEST_REGISTER_STATE_CHECK_H_

--- a/test/svc_test.h

+++ b/test/svc_test.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef TEST_SVC_TEST_H_

-#define TEST_SVC_TEST_H_

+#ifndef VPX_TEST_SVC_TEST_H_

+#define VPX_TEST_SVC_TEST_H_

 #include "./vpx_config.h"

 #include "third_party/googletest/src/include/gtest/gtest.h"

@@ -59,4 +59,4 @@

 };

 }  // namespace svc_test

-#endif  // TEST_SVC_TEST_H_

+#endif  // VPX_TEST_SVC_TEST_H_

--- a/test/test_vectors.h

+++ b/test/test_vectors.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef TEST_TEST_VECTORS_H_

-#define TEST_TEST_VECTORS_H_

+#ifndef VPX_TEST_TEST_VECTORS_H_

+#define VPX_TEST_TEST_VECTORS_H_

 #include "./vpx_config.h"

@@ -31,4 +31,4 @@

 }  // namespace libvpx_test

-#endif  // TEST_TEST_VECTORS_H_

+#endif  // VPX_TEST_TEST_VECTORS_H_

--- a/test/util.h

+++ b/test/util.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef TEST_UTIL_H_

-#define TEST_UTIL_H_

+#ifndef VPX_TEST_UTIL_H_

+#define VPX_TEST_UTIL_H_

 #include <stdio.h>

 #include <math.h>

@@ -43,4 +43,4 @@

   return psnr;

 }

-#endif  // TEST_UTIL_H_

+#endif  // VPX_TEST_UTIL_H_

--- a/test/video_source.h

+++ b/test/video_source.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef TEST_VIDEO_SOURCE_H_

-#define TEST_VIDEO_SOURCE_H_

+#ifndef VPX_TEST_VIDEO_SOURCE_H_

+#define VPX_TEST_VIDEO_SOURCE_H_

 #if defined(_WIN32)

 #undef NOMINMAX

@@ -255,4 +255,4 @@

 }  // namespace libvpx_test

-#endif  // TEST_VIDEO_SOURCE_H_

+#endif  // VPX_TEST_VIDEO_SOURCE_H_

--- a/test/vpx_scale_test.h

+++ b/test/vpx_scale_test.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef TEST_VPX_SCALE_TEST_H_

-#define TEST_VPX_SCALE_TEST_H_

+#ifndef VPX_TEST_VPX_SCALE_TEST_H_

+#define VPX_TEST_VPX_SCALE_TEST_H_

 #include "third_party/googletest/src/include/gtest/gtest.h"

@@ -198,4 +198,4 @@

 }  // namespace libvpx_test

-#endif  // TEST_VPX_SCALE_TEST_H_

+#endif  // VPX_TEST_VPX_SCALE_TEST_H_

--- a/test/webm_video_source.h

+++ b/test/webm_video_source.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef TEST_WEBM_VIDEO_SOURCE_H_

-#define TEST_WEBM_VIDEO_SOURCE_H_

+#ifndef VPX_TEST_WEBM_VIDEO_SOURCE_H_

+#define VPX_TEST_WEBM_VIDEO_SOURCE_H_

 #include <cstdarg>

 #include <cstdio>

 #include <cstdlib>

@@ -90,4 +90,4 @@

 }  // namespace libvpx_test

-#endif  // TEST_WEBM_VIDEO_SOURCE_H_

+#endif  // VPX_TEST_WEBM_VIDEO_SOURCE_H_

--- a/test/y4m_video_source.h

+++ b/test/y4m_video_source.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef TEST_Y4M_VIDEO_SOURCE_H_

-#define TEST_Y4M_VIDEO_SOURCE_H_

+#ifndef VPX_TEST_Y4M_VIDEO_SOURCE_H_

+#define VPX_TEST_Y4M_VIDEO_SOURCE_H_

 #include <algorithm>

 #include <string>

@@ -119,4 +119,4 @@

 }  // namespace libvpx_test

-#endif  // TEST_Y4M_VIDEO_SOURCE_H_

+#endif  // VPX_TEST_Y4M_VIDEO_SOURCE_H_

--- a/test/yuv_video_source.h

+++ b/test/yuv_video_source.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef TEST_YUV_VIDEO_SOURCE_H_

-#define TEST_YUV_VIDEO_SOURCE_H_

+#ifndef VPX_TEST_YUV_VIDEO_SOURCE_H_

+#define VPX_TEST_YUV_VIDEO_SOURCE_H_

 #include <cstdio>

 #include <cstdlib>

@@ -122,4 +122,4 @@

 }  // namespace libvpx_test

-#endif  // TEST_YUV_VIDEO_SOURCE_H_

+#endif  // VPX_TEST_YUV_VIDEO_SOURCE_H_

--- a/tools_common.h

+++ b/tools_common.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef TOOLS_COMMON_H_

-#define TOOLS_COMMON_H_

+#ifndef VPX_TOOLS_COMMON_H_

+#define VPX_TOOLS_COMMON_H_

 #include <stdio.h>

@@ -163,4 +163,4 @@

 } /* extern "C" */

 #endif

-#endif  // TOOLS_COMMON_H_

+#endif  // VPX_TOOLS_COMMON_H_

--- a/video_common.h

+++ b/video_common.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VIDEO_COMMON_H_

-#define VIDEO_COMMON_H_

+#ifndef VPX_VIDEO_COMMON_H_

+#define VPX_VIDEO_COMMON_H_

 #include "./tools_common.h"

@@ -20,4 +20,4 @@

   struct VpxRational time_base;

 } VpxVideoInfo;

-#endif  // VIDEO_COMMON_H_

+#endif  // VPX_VIDEO_COMMON_H_

--- a/video_reader.h

+++ b/video_reader.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VIDEO_READER_H_

-#define VIDEO_READER_H_

+#ifndef VPX_VIDEO_READER_H_

+#define VPX_VIDEO_READER_H_

 #include "./video_common.h"

@@ -48,4 +48,4 @@

 }  // extern "C"

 #endif

-#endif  // VIDEO_READER_H_

+#endif  // VPX_VIDEO_READER_H_

--- a/video_writer.h

+++ b/video_writer.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VIDEO_WRITER_H_

-#define VIDEO_WRITER_H_

+#ifndef VPX_VIDEO_WRITER_H_

+#define VPX_VIDEO_WRITER_H_

 #include "./video_common.h"

@@ -41,4 +41,4 @@

 }  // extern "C"

 #endif

-#endif  // VIDEO_WRITER_H_

+#endif  // VPX_VIDEO_WRITER_H_

--- a/vp8/common/alloccommon.h

+++ b/vp8/common/alloccommon.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_ALLOCCOMMON_H_

-#define VP8_COMMON_ALLOCCOMMON_H_

+#ifndef VPX_VP8_COMMON_ALLOCCOMMON_H_

+#define VPX_VP8_COMMON_ALLOCCOMMON_H_

 #include "onyxc_int.h"

@@ -27,4 +27,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_ALLOCCOMMON_H_

+#endif  // VPX_VP8_COMMON_ALLOCCOMMON_H_

--- a/vp8/common/blockd.h

+++ b/vp8/common/blockd.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_BLOCKD_H_

-#define VP8_COMMON_BLOCKD_H_

+#ifndef VPX_VP8_COMMON_BLOCKD_H_

+#define VPX_VP8_COMMON_BLOCKD_H_

 void vpx_log(const char *format, ...);

@@ -304,4 +304,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_BLOCKD_H_

+#endif  // VPX_VP8_COMMON_BLOCKD_H_

--- a/vp8/common/coefupdateprobs.h

+++ b/vp8/common/coefupdateprobs.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_COEFUPDATEPROBS_H_

-#define VP8_COMMON_COEFUPDATEPROBS_H_

+#ifndef VPX_VP8_COMMON_COEFUPDATEPROBS_H_

+#define VPX_VP8_COMMON_COEFUPDATEPROBS_H_

 #ifdef __cplusplus

 extern "C" {

@@ -194,4 +194,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_COEFUPDATEPROBS_H_

+#endif  // VPX_VP8_COMMON_COEFUPDATEPROBS_H_

--- a/vp8/common/common.h

+++ b/vp8/common/common.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_COMMON_H_

-#define VP8_COMMON_COMMON_H_

+#ifndef VPX_VP8_COMMON_COMMON_H_

+#define VPX_VP8_COMMON_COMMON_H_

 #include <assert.h>

@@ -45,4 +45,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_COMMON_H_

+#endif  // VPX_VP8_COMMON_COMMON_H_

--- a/vp8/common/default_coef_probs.h

+++ b/vp8/common/default_coef_probs.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_DEFAULT_COEF_PROBS_H_

-#define VP8_COMMON_DEFAULT_COEF_PROBS_H_

+#ifndef VPX_VP8_COMMON_DEFAULT_COEF_PROBS_H_

+#define VPX_VP8_COMMON_DEFAULT_COEF_PROBS_H_

 #ifdef __cplusplus

 extern "C" {

@@ -157,4 +157,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_DEFAULT_COEF_PROBS_H_

+#endif  // VPX_VP8_COMMON_DEFAULT_COEF_PROBS_H_

--- a/vp8/common/entropy.h

+++ b/vp8/common/entropy.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_ENTROPY_H_

-#define VP8_COMMON_ENTROPY_H_

+#ifndef VPX_VP8_COMMON_ENTROPY_H_

+#define VPX_VP8_COMMON_ENTROPY_H_

 #include "treecoder.h"

 #include "blockd.h"

@@ -105,4 +105,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_ENTROPY_H_

+#endif  // VPX_VP8_COMMON_ENTROPY_H_

--- a/vp8/common/entropymode.h

+++ b/vp8/common/entropymode.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_ENTROPYMODE_H_

-#define VP8_COMMON_ENTROPYMODE_H_

+#ifndef VPX_VP8_COMMON_ENTROPYMODE_H_

+#define VPX_VP8_COMMON_ENTROPYMODE_H_

 #include "onyxc_int.h"

 #include "treecoder.h"

@@ -85,4 +85,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_ENTROPYMODE_H_

+#endif  // VPX_VP8_COMMON_ENTROPYMODE_H_

--- a/vp8/common/entropymv.h

+++ b/vp8/common/entropymv.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_ENTROPYMV_H_

-#define VP8_COMMON_ENTROPYMV_H_

+#ifndef VPX_VP8_COMMON_ENTROPYMV_H_

+#define VPX_VP8_COMMON_ENTROPYMV_H_

 #include "treecoder.h"

@@ -46,4 +46,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_ENTROPYMV_H_

+#endif  // VPX_VP8_COMMON_ENTROPYMV_H_

--- a/vp8/common/extend.h

+++ b/vp8/common/extend.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_EXTEND_H_

-#define VP8_COMMON_EXTEND_H_

+#ifndef VPX_VP8_COMMON_EXTEND_H_

+#define VPX_VP8_COMMON_EXTEND_H_

 #include "vpx_scale/yv12config.h"

@@ -29,4 +29,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_EXTEND_H_

+#endif  // VPX_VP8_COMMON_EXTEND_H_

--- a/vp8/common/filter.h

+++ b/vp8/common/filter.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_FILTER_H_

-#define VP8_COMMON_FILTER_H_

+#ifndef VPX_VP8_COMMON_FILTER_H_

+#define VPX_VP8_COMMON_FILTER_H_

 #include "vpx_ports/mem.h"

@@ -28,4 +28,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_FILTER_H_

+#endif  // VPX_VP8_COMMON_FILTER_H_

--- a/vp8/common/findnearmv.h

+++ b/vp8/common/findnearmv.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_FINDNEARMV_H_

-#define VP8_COMMON_FINDNEARMV_H_

+#ifndef VPX_VP8_COMMON_FINDNEARMV_H_

+#define VPX_VP8_COMMON_FINDNEARMV_H_

 #include "./vpx_config.h"

 #include "mv.h"

@@ -148,4 +148,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_FINDNEARMV_H_

+#endif  // VPX_VP8_COMMON_FINDNEARMV_H_

--- a/vp8/common/header.h

+++ b/vp8/common/header.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_HEADER_H_

-#define VP8_COMMON_HEADER_H_

+#ifndef VPX_VP8_COMMON_HEADER_H_

+#define VPX_VP8_COMMON_HEADER_H_

 #ifdef __cplusplus

 extern "C" {

@@ -45,4 +45,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_HEADER_H_

+#endif  // VPX_VP8_COMMON_HEADER_H_

--- a/vp8/common/invtrans.h

+++ b/vp8/common/invtrans.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_INVTRANS_H_

-#define VP8_COMMON_INVTRANS_H_

+#ifndef VPX_VP8_COMMON_INVTRANS_H_

+#define VPX_VP8_COMMON_INVTRANS_H_

 #include "./vpx_config.h"

 #include "vp8_rtcd.h"

@@ -54,4 +54,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_INVTRANS_H_

+#endif  // VPX_VP8_COMMON_INVTRANS_H_

--- a/vp8/common/loopfilter.h

+++ b/vp8/common/loopfilter.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_LOOPFILTER_H_

-#define VP8_COMMON_LOOPFILTER_H_

+#ifndef VPX_VP8_COMMON_LOOPFILTER_H_

+#define VPX_VP8_COMMON_LOOPFILTER_H_

 #include "vpx_ports/mem.h"

 #include "vpx_config.h"

@@ -100,4 +100,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_LOOPFILTER_H_

+#endif  // VPX_VP8_COMMON_LOOPFILTER_H_

--- a/vp8/common/mips/msa/vp8_macros_msa.h

+++ b/vp8/common/mips/msa/vp8_macros_msa.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_MIPS_MSA_VP8_MACROS_MSA_H_

-#define VP8_COMMON_MIPS_MSA_VP8_MACROS_MSA_H_

+#ifndef VPX_VP8_COMMON_MIPS_MSA_VP8_MACROS_MSA_H_

+#define VPX_VP8_COMMON_MIPS_MSA_VP8_MACROS_MSA_H_

 #include <msa.h>

@@ -1757,4 +1757,4 @@

                                                                 \

     tmp1_m;                                                     \

   })

-#endif /* VP8_COMMON_MIPS_MSA_VP8_MACROS_MSA_H_ */

+#endif  // VPX_VP8_COMMON_MIPS_MSA_VP8_MACROS_MSA_H_

--- a/vp8/common/modecont.h

+++ b/vp8/common/modecont.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_MODECONT_H_

-#define VP8_COMMON_MODECONT_H_

+#ifndef VPX_VP8_COMMON_MODECONT_H_

+#define VPX_VP8_COMMON_MODECONT_H_

 #ifdef __cplusplus

 extern "C" {

@@ -21,4 +21,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_MODECONT_H_

+#endif  // VPX_VP8_COMMON_MODECONT_H_

--- a/vp8/common/mv.h

+++ b/vp8/common/mv.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_MV_H_

-#define VP8_COMMON_MV_H_

+#ifndef VPX_VP8_COMMON_MV_H_

+#define VPX_VP8_COMMON_MV_H_

 #include "vpx/vpx_integer.h"

 #ifdef __cplusplus

@@ -30,4 +30,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_MV_H_

+#endif  // VPX_VP8_COMMON_MV_H_

--- a/vp8/common/onyx.h

+++ b/vp8/common/onyx.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_ONYX_H_

-#define VP8_COMMON_ONYX_H_

+#ifndef VPX_VP8_COMMON_ONYX_H_

+#define VPX_VP8_COMMON_ONYX_H_

 #ifdef __cplusplus

 extern "C" {

@@ -281,4 +281,4 @@

 }

 #endif

-#endif  // VP8_COMMON_ONYX_H_

+#endif  // VPX_VP8_COMMON_ONYX_H_

--- a/vp8/common/onyxc_int.h

+++ b/vp8/common/onyxc_int.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_ONYXC_INT_H_

-#define VP8_COMMON_ONYXC_INT_H_

+#ifndef VPX_VP8_COMMON_ONYXC_INT_H_

+#define VPX_VP8_COMMON_ONYXC_INT_H_

 #include "vpx_config.h"

 #include "vp8_rtcd.h"

@@ -174,4 +174,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_ONYXC_INT_H_

+#endif  // VPX_VP8_COMMON_ONYXC_INT_H_

--- a/vp8/common/onyxd.h

+++ b/vp8/common/onyxd.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_ONYXD_H_

-#define VP8_COMMON_ONYXD_H_

+#ifndef VPX_VP8_COMMON_ONYXD_H_

+#define VPX_VP8_COMMON_ONYXD_H_

 /* Create/destroy static data structures. */

 #ifdef __cplusplus

@@ -60,4 +60,4 @@

 }

 #endif

-#endif  // VP8_COMMON_ONYXD_H_

+#endif  // VPX_VP8_COMMON_ONYXD_H_

--- a/vp8/common/postproc.h

+++ b/vp8/common/postproc.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_POSTPROC_H_

-#define VP8_COMMON_POSTPROC_H_

+#ifndef VPX_VP8_COMMON_POSTPROC_H_

+#define VPX_VP8_COMMON_POSTPROC_H_

 #include "vpx_ports/mem.h"

 struct postproc_state {

@@ -43,4 +43,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_POSTPROC_H_

+#endif  // VPX_VP8_COMMON_POSTPROC_H_

--- a/vp8/common/ppflags.h

+++ b/vp8/common/ppflags.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_PPFLAGS_H_

-#define VP8_COMMON_PPFLAGS_H_

+#ifndef VPX_VP8_COMMON_PPFLAGS_H_

+#define VPX_VP8_COMMON_PPFLAGS_H_

 #ifdef __cplusplus

 extern "C" {

@@ -36,4 +36,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_PPFLAGS_H_

+#endif  // VPX_VP8_COMMON_PPFLAGS_H_

--- a/vp8/common/quant_common.h

+++ b/vp8/common/quant_common.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_QUANT_COMMON_H_

-#define VP8_COMMON_QUANT_COMMON_H_

+#ifndef VPX_VP8_COMMON_QUANT_COMMON_H_

+#define VPX_VP8_COMMON_QUANT_COMMON_H_

 #include "string.h"

 #include "blockd.h"

@@ -30,4 +30,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_QUANT_COMMON_H_

+#endif  // VPX_VP8_COMMON_QUANT_COMMON_H_

--- a/vp8/common/reconinter.h

+++ b/vp8/common/reconinter.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_RECONINTER_H_

-#define VP8_COMMON_RECONINTER_H_

+#ifndef VPX_VP8_COMMON_RECONINTER_H_

+#define VPX_VP8_COMMON_RECONINTER_H_

 #ifdef __cplusplus

 extern "C" {

@@ -34,4 +34,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_RECONINTER_H_

+#endif  // VPX_VP8_COMMON_RECONINTER_H_

--- a/vp8/common/reconintra.h

+++ b/vp8/common/reconintra.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_RECONINTRA_H_

-#define VP8_COMMON_RECONINTRA_H_

+#ifndef VPX_VP8_COMMON_RECONINTRA_H_

+#define VPX_VP8_COMMON_RECONINTRA_H_

 #include "vp8/common/blockd.h"

@@ -32,4 +32,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_RECONINTRA_H_

+#endif  // VPX_VP8_COMMON_RECONINTRA_H_

--- a/vp8/common/reconintra4x4.h

+++ b/vp8/common/reconintra4x4.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_RECONINTRA4X4_H_

-#define VP8_COMMON_RECONINTRA4X4_H_

+#ifndef VPX_VP8_COMMON_RECONINTRA4X4_H_

+#define VPX_VP8_COMMON_RECONINTRA4X4_H_

 #include "vp8/common/blockd.h"

 #ifdef __cplusplus

@@ -42,4 +42,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_RECONINTRA4X4_H_

+#endif  // VPX_VP8_COMMON_RECONINTRA4X4_H_

--- a/vp8/common/setupintrarecon.h

+++ b/vp8/common/setupintrarecon.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_SETUPINTRARECON_H_

-#define VP8_COMMON_SETUPINTRARECON_H_

+#ifndef VPX_VP8_COMMON_SETUPINTRARECON_H_

+#define VPX_VP8_COMMON_SETUPINTRARECON_H_

 #include "./vpx_config.h"

 #include "vpx_scale/yv12config.h"

@@ -37,4 +37,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_SETUPINTRARECON_H_

+#endif  // VPX_VP8_COMMON_SETUPINTRARECON_H_

--- a/vp8/common/swapyv12buffer.h

+++ b/vp8/common/swapyv12buffer.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_SWAPYV12BUFFER_H_

-#define VP8_COMMON_SWAPYV12BUFFER_H_

+#ifndef VPX_VP8_COMMON_SWAPYV12BUFFER_H_

+#define VPX_VP8_COMMON_SWAPYV12BUFFER_H_

 #include "vpx_scale/yv12config.h"

@@ -24,4 +24,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_SWAPYV12BUFFER_H_

+#endif  // VPX_VP8_COMMON_SWAPYV12BUFFER_H_

--- a/vp8/common/systemdependent.h

+++ b/vp8/common/systemdependent.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_SYSTEMDEPENDENT_H_

-#define VP8_COMMON_SYSTEMDEPENDENT_H_

+#ifndef VPX_VP8_COMMON_SYSTEMDEPENDENT_H_

+#define VPX_VP8_COMMON_SYSTEMDEPENDENT_H_

 #include "vpx_config.h"

@@ -24,4 +24,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_SYSTEMDEPENDENT_H_

+#endif  // VPX_VP8_COMMON_SYSTEMDEPENDENT_H_

--- a/vp8/common/threading.h

+++ b/vp8/common/threading.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_THREADING_H_

-#define VP8_COMMON_THREADING_H_

+#ifndef VPX_VP8_COMMON_THREADING_H_

+#define VPX_VP8_COMMON_THREADING_H_

 #include "./vpx_config.h"

@@ -209,4 +209,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_THREADING_H_

+#endif  // VPX_VP8_COMMON_THREADING_H_

--- a/vp8/common/treecoder.h

+++ b/vp8/common/treecoder.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_TREECODER_H_

-#define VP8_COMMON_TREECODER_H_

+#ifndef VPX_VP8_COMMON_TREECODER_H_

+#define VPX_VP8_COMMON_TREECODER_H_

 #ifdef __cplusplus

 extern "C" {

@@ -79,4 +79,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_TREECODER_H_

+#endif  // VPX_VP8_COMMON_TREECODER_H_

--- a/vp8/common/vp8_entropymodedata.h

+++ b/vp8/common/vp8_entropymodedata.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_VP8_ENTROPYMODEDATA_H_

-#define VP8_COMMON_VP8_ENTROPYMODEDATA_H_

+#ifndef VPX_VP8_COMMON_VP8_ENTROPYMODEDATA_H_

+#define VPX_VP8_COMMON_VP8_ENTROPYMODEDATA_H_

 #ifdef __cplusplus

 extern "C" {

@@ -169,4 +169,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_VP8_ENTROPYMODEDATA_H_

+#endif  // VPX_VP8_COMMON_VP8_ENTROPYMODEDATA_H_

--- a/vp8/common/vp8_skin_detection.h

+++ b/vp8/common/vp8_skin_detection.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_SKIN_DETECTION_H_

-#define VP8_COMMON_SKIN_DETECTION_H_

+#ifndef VPX_VP8_COMMON_VP8_SKIN_DETECTION_H_

+#define VPX_VP8_COMMON_VP8_SKIN_DETECTION_H_

 #include "vp8/encoder/onyx_int.h"

 #include "vpx/vpx_integer.h"

@@ -44,4 +44,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_SKIN_DETECTION_H_

+#endif  // VPX_VP8_COMMON_VP8_SKIN_DETECTION_H_

--- a/vp8/common/x86/filter_x86.h

+++ b/vp8/common/x86/filter_x86.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_COMMON_X86_FILTER_X86_H_

-#define VP8_COMMON_X86_FILTER_X86_H_

+#ifndef VPX_VP8_COMMON_X86_FILTER_X86_H_

+#define VPX_VP8_COMMON_X86_FILTER_X86_H_

 #include "vpx_ports/mem.h"

@@ -30,4 +30,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_COMMON_X86_FILTER_X86_H_

+#endif  // VPX_VP8_COMMON_X86_FILTER_X86_H_

--- a/vp8/decoder/dboolhuff.h

+++ b/vp8/decoder/dboolhuff.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_DECODER_DBOOLHUFF_H_

-#define VP8_DECODER_DBOOLHUFF_H_

+#ifndef VPX_VP8_DECODER_DBOOLHUFF_H_

+#define VPX_VP8_DECODER_DBOOLHUFF_H_

 #include <stddef.h>

 #include <limits.h>

@@ -127,4 +127,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_DECODER_DBOOLHUFF_H_

+#endif  // VPX_VP8_DECODER_DBOOLHUFF_H_

--- a/vp8/decoder/decodemv.h

+++ b/vp8/decoder/decodemv.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_DECODER_DECODEMV_H_

-#define VP8_DECODER_DECODEMV_H_

+#ifndef VPX_VP8_DECODER_DECODEMV_H_

+#define VPX_VP8_DECODER_DECODEMV_H_

 #include "onyxd_int.h"

@@ -23,4 +23,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_DECODER_DECODEMV_H_

+#endif  // VPX_VP8_DECODER_DECODEMV_H_

--- a/vp8/decoder/decoderthreading.h

+++ b/vp8/decoder/decoderthreading.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_DECODER_DECODERTHREADING_H_

-#define VP8_DECODER_DECODERTHREADING_H_

+#ifndef VPX_VP8_DECODER_DECODERTHREADING_H_

+#define VPX_VP8_DECODER_DECODERTHREADING_H_

 #ifdef __cplusplus

 extern "C" {

@@ -27,4 +27,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_DECODER_DECODERTHREADING_H_

+#endif  // VPX_VP8_DECODER_DECODERTHREADING_H_

--- a/vp8/decoder/detokenize.h

+++ b/vp8/decoder/detokenize.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_DECODER_DETOKENIZE_H_

-#define VP8_DECODER_DETOKENIZE_H_

+#ifndef VPX_VP8_DECODER_DETOKENIZE_H_

+#define VPX_VP8_DECODER_DETOKENIZE_H_

 #include "onyxd_int.h"

@@ -24,4 +24,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_DECODER_DETOKENIZE_H_

+#endif  // VPX_VP8_DECODER_DETOKENIZE_H_

--- a/vp8/decoder/ec_types.h

+++ b/vp8/decoder/ec_types.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_DECODER_EC_TYPES_H_

-#define VP8_DECODER_EC_TYPES_H_

+#ifndef VPX_VP8_DECODER_EC_TYPES_H_

+#define VPX_VP8_DECODER_EC_TYPES_H_

 #ifdef __cplusplus

 extern "C" {

@@ -50,4 +50,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_DECODER_EC_TYPES_H_

+#endif  // VPX_VP8_DECODER_EC_TYPES_H_

--- a/vp8/decoder/error_concealment.h

+++ b/vp8/decoder/error_concealment.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_DECODER_ERROR_CONCEALMENT_H_

-#define VP8_DECODER_ERROR_CONCEALMENT_H_

+#ifndef VPX_VP8_DECODER_ERROR_CONCEALMENT_H_

+#define VPX_VP8_DECODER_ERROR_CONCEALMENT_H_

 #include "onyxd_int.h"

 #include "ec_types.h"

@@ -38,4 +38,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_DECODER_ERROR_CONCEALMENT_H_

+#endif  // VPX_VP8_DECODER_ERROR_CONCEALMENT_H_

--- a/vp8/decoder/onyxd_int.h

+++ b/vp8/decoder/onyxd_int.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_DECODER_ONYXD_INT_H_

-#define VP8_DECODER_ONYXD_INT_H_

+#ifndef VPX_VP8_DECODER_ONYXD_INT_H_

+#define VPX_VP8_DECODER_ONYXD_INT_H_

 #include "vpx_config.h"

 #include "vp8/common/onyxd.h"

@@ -150,4 +150,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_DECODER_ONYXD_INT_H_

+#endif  // VPX_VP8_DECODER_ONYXD_INT_H_

--- a/vp8/decoder/treereader.h

+++ b/vp8/decoder/treereader.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_DECODER_TREEREADER_H_

-#define VP8_DECODER_TREEREADER_H_

+#ifndef VPX_VP8_DECODER_TREEREADER_H_

+#define VPX_VP8_DECODER_TREEREADER_H_

 #include "./vpx_config.h"

 #include "vp8/common/treecoder.h"

@@ -42,4 +42,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_DECODER_TREEREADER_H_

+#endif  // VPX_VP8_DECODER_TREEREADER_H_

--- a/vp8/encoder/bitstream.h

+++ b/vp8/encoder/bitstream.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_BITSTREAM_H_

-#define VP8_ENCODER_BITSTREAM_H_

+#ifndef VPX_VP8_ENCODER_BITSTREAM_H_

+#define VPX_VP8_ENCODER_BITSTREAM_H_

 #ifdef __cplusplus

 extern "C" {

@@ -29,4 +29,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_BITSTREAM_H_

+#endif  // VPX_VP8_ENCODER_BITSTREAM_H_

--- a/vp8/encoder/block.h

+++ b/vp8/encoder/block.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_BLOCK_H_

-#define VP8_ENCODER_BLOCK_H_

+#ifndef VPX_VP8_ENCODER_BLOCK_H_

+#define VPX_VP8_ENCODER_BLOCK_H_

 #include "vp8/common/onyx.h"

 #include "vp8/common/blockd.h"

@@ -165,4 +165,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_BLOCK_H_

+#endif  // VPX_VP8_ENCODER_BLOCK_H_

--- a/vp8/encoder/boolhuff.h

+++ b/vp8/encoder/boolhuff.h

@@ -15,8 +15,8 @@

  *   Description  :     Bool Coder header file.

  *

  ****************************************************************************/

-#ifndef VP8_ENCODER_BOOLHUFF_H_

-#define VP8_ENCODER_BOOLHUFF_H_

+#ifndef VPX_VP8_ENCODER_BOOLHUFF_H_

+#define VPX_VP8_ENCODER_BOOLHUFF_H_

 #include "vpx_ports/mem.h"

 #include "vpx/internal/vpx_codec_internal.h"

@@ -121,4 +121,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_BOOLHUFF_H_

+#endif  // VPX_VP8_ENCODER_BOOLHUFF_H_

--- a/vp8/encoder/dct_value_cost.h

+++ b/vp8/encoder/dct_value_cost.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_DCT_VALUE_COST_H_

-#define VP8_ENCODER_DCT_VALUE_COST_H_

+#ifndef VPX_VP8_ENCODER_DCT_VALUE_COST_H_

+#define VPX_VP8_ENCODER_DCT_VALUE_COST_H_

 #ifdef __cplusplus

 extern "C" {

@@ -341,4 +341,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_DCT_VALUE_COST_H_

+#endif  // VPX_VP8_ENCODER_DCT_VALUE_COST_H_

--- a/vp8/encoder/dct_value_tokens.h

+++ b/vp8/encoder/dct_value_tokens.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_DCT_VALUE_TOKENS_H_

-#define VP8_ENCODER_DCT_VALUE_TOKENS_H_

+#ifndef VPX_VP8_ENCODER_DCT_VALUE_TOKENS_H_

+#define VPX_VP8_ENCODER_DCT_VALUE_TOKENS_H_

 #ifdef __cplusplus

 extern "C" {

@@ -845,4 +845,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_DCT_VALUE_TOKENS_H_

+#endif  // VPX_VP8_ENCODER_DCT_VALUE_TOKENS_H_

--- a/vp8/encoder/defaultcoefcounts.h

+++ b/vp8/encoder/defaultcoefcounts.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_DEFAULTCOEFCOUNTS_H_

-#define VP8_ENCODER_DEFAULTCOEFCOUNTS_H_

+#ifndef VPX_VP8_ENCODER_DEFAULTCOEFCOUNTS_H_

+#define VPX_VP8_ENCODER_DEFAULTCOEFCOUNTS_H_

 #ifdef __cplusplus

 extern "C" {

@@ -232,4 +232,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_DEFAULTCOEFCOUNTS_H_

+#endif  // VPX_VP8_ENCODER_DEFAULTCOEFCOUNTS_H_

--- a/vp8/encoder/denoising.h

+++ b/vp8/encoder/denoising.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_DENOISING_H_

-#define VP8_ENCODER_DENOISING_H_

+#ifndef VPX_VP8_ENCODER_DENOISING_H_

+#define VPX_VP8_ENCODER_DENOISING_H_

 #include "block.h"

 #include "vp8/common/loopfilter.h"

@@ -100,4 +100,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_DENOISING_H_

+#endif  // VPX_VP8_ENCODER_DENOISING_H_

--- a/vp8/encoder/encodeframe.h

+++ b/vp8/encoder/encodeframe.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_ENCODEFRAME_H_

-#define VP8_ENCODER_ENCODEFRAME_H_

+#ifndef VPX_VP8_ENCODER_ENCODEFRAME_H_

+#define VPX_VP8_ENCODER_ENCODEFRAME_H_

 #include "vp8/encoder/tokenize.h"

@@ -37,4 +37,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_ENCODEFRAME_H_

+#endif  // VPX_VP8_ENCODER_ENCODEFRAME_H_

--- a/vp8/encoder/encodeintra.h

+++ b/vp8/encoder/encodeintra.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_ENCODEINTRA_H_

-#define VP8_ENCODER_ENCODEINTRA_H_

+#ifndef VPX_VP8_ENCODER_ENCODEINTRA_H_

+#define VPX_VP8_ENCODER_ENCODEINTRA_H_

 #include "onyx_int.h"

 #ifdef __cplusplus

@@ -25,4 +25,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_ENCODEINTRA_H_

+#endif  // VPX_VP8_ENCODER_ENCODEINTRA_H_

--- a/vp8/encoder/encodemb.h

+++ b/vp8/encoder/encodemb.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_ENCODEMB_H_

-#define VP8_ENCODER_ENCODEMB_H_

+#ifndef VPX_VP8_ENCODER_ENCODEMB_H_

+#define VPX_VP8_ENCODER_ENCODEMB_H_

 #include "onyx_int.h"

@@ -37,4 +37,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_ENCODEMB_H_

+#endif  // VPX_VP8_ENCODER_ENCODEMB_H_

--- a/vp8/encoder/encodemv.h

+++ b/vp8/encoder/encodemv.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_ENCODEMV_H_

-#define VP8_ENCODER_ENCODEMV_H_

+#ifndef VPX_VP8_ENCODER_ENCODEMV_H_

+#define VPX_VP8_ENCODER_ENCODEMV_H_

 #include "onyx_int.h"

@@ -26,4 +26,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_ENCODEMV_H_

+#endif  // VPX_VP8_ENCODER_ENCODEMV_H_

--- a/vp8/encoder/ethreading.h

+++ b/vp8/encoder/ethreading.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_ETHREADING_H_

-#define VP8_ENCODER_ETHREADING_H_

+#ifndef VPX_VP8_ENCODER_ETHREADING_H_

+#define VPX_VP8_ENCODER_ETHREADING_H_

 #include "vp8/encoder/onyx_int.h"

@@ -29,4 +29,4 @@

 }

 #endif

-#endif  // VP8_ENCODER_ETHREADING_H_

+#endif  // VPX_VP8_ENCODER_ETHREADING_H_

--- a/vp8/encoder/firstpass.h

+++ b/vp8/encoder/firstpass.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_FIRSTPASS_H_

-#define VP8_ENCODER_FIRSTPASS_H_

+#ifndef VPX_VP8_ENCODER_FIRSTPASS_H_

+#define VPX_VP8_ENCODER_FIRSTPASS_H_

 #ifdef __cplusplus

 extern "C" {

@@ -28,4 +28,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_FIRSTPASS_H_

+#endif  // VPX_VP8_ENCODER_FIRSTPASS_H_

--- a/vp8/encoder/lookahead.h

+++ b/vp8/encoder/lookahead.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_LOOKAHEAD_H_

-#define VP8_ENCODER_LOOKAHEAD_H_

+#ifndef VPX_VP8_ENCODER_LOOKAHEAD_H_

+#define VPX_VP8_ENCODER_LOOKAHEAD_H_

 #include "vpx_scale/yv12config.h"

 #include "vpx/vpx_integer.h"

@@ -96,4 +96,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_LOOKAHEAD_H_

+#endif  // VPX_VP8_ENCODER_LOOKAHEAD_H_

--- a/vp8/encoder/mcomp.h

+++ b/vp8/encoder/mcomp.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_MCOMP_H_

-#define VP8_ENCODER_MCOMP_H_

+#ifndef VPX_VP8_ENCODER_MCOMP_H_

+#define VPX_VP8_ENCODER_MCOMP_H_

 #include "block.h"

 #include "vpx_dsp/variance.h"

@@ -78,4 +78,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_MCOMP_H_

+#endif  // VPX_VP8_ENCODER_MCOMP_H_

--- a/vp8/encoder/modecosts.h

+++ b/vp8/encoder/modecosts.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_MODECOSTS_H_

-#define VP8_ENCODER_MODECOSTS_H_

+#ifndef VPX_VP8_ENCODER_MODECOSTS_H_

+#define VPX_VP8_ENCODER_MODECOSTS_H_

 #ifdef __cplusplus

 extern "C" {

@@ -23,4 +23,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_MODECOSTS_H_

+#endif  // VPX_VP8_ENCODER_MODECOSTS_H_

--- a/vp8/encoder/mr_dissim.h

+++ b/vp8/encoder/mr_dissim.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_MR_DISSIM_H_

-#define VP8_ENCODER_MR_DISSIM_H_

+#ifndef VPX_VP8_ENCODER_MR_DISSIM_H_

+#define VPX_VP8_ENCODER_MR_DISSIM_H_

 #include "vpx_config.h"

 #ifdef __cplusplus

@@ -24,4 +24,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_MR_DISSIM_H_

+#endif  // VPX_VP8_ENCODER_MR_DISSIM_H_

--- a/vp8/encoder/onyx_int.h

+++ b/vp8/encoder/onyx_int.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_ONYX_INT_H_

-#define VP8_ENCODER_ONYX_INT_H_

+#ifndef VPX_VP8_ENCODER_ONYX_INT_H_

+#define VPX_VP8_ENCODER_ONYX_INT_H_

 #include <stdio.h>

 #include "vpx_config.h"

@@ -733,4 +733,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_ONYX_INT_H_

+#endif  // VPX_VP8_ENCODER_ONYX_INT_H_

--- a/vp8/encoder/pickinter.h

+++ b/vp8/encoder/pickinter.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_PICKINTER_H_

-#define VP8_ENCODER_PICKINTER_H_

+#ifndef VPX_VP8_ENCODER_PICKINTER_H_

+#define VPX_VP8_ENCODER_PICKINTER_H_

 #include "vpx_config.h"

 #include "vp8/common/onyxc_int.h"

@@ -30,4 +30,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_PICKINTER_H_

+#endif  // VPX_VP8_ENCODER_PICKINTER_H_

--- a/vp8/encoder/picklpf.h

+++ b/vp8/encoder/picklpf.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_PICKLPF_H_

-#define VP8_ENCODER_PICKLPF_H_

+#ifndef VPX_VP8_ENCODER_PICKLPF_H_

+#define VPX_VP8_ENCODER_PICKLPF_H_

 #ifdef __cplusplus

 extern "C" {

@@ -27,4 +27,4 @@

 }

 #endif

-#endif  // VP8_ENCODER_PICKLPF_H_

+#endif  // VPX_VP8_ENCODER_PICKLPF_H_

--- a/vp8/encoder/quantize.h

+++ b/vp8/encoder/quantize.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_QUANTIZE_H_

-#define VP8_ENCODER_QUANTIZE_H_

+#ifndef VPX_VP8_ENCODER_QUANTIZE_H_

+#define VPX_VP8_ENCODER_QUANTIZE_H_

 #ifdef __cplusplus

 extern "C" {

@@ -31,4 +31,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_QUANTIZE_H_

+#endif  // VPX_VP8_ENCODER_QUANTIZE_H_

--- a/vp8/encoder/ratectrl.h

+++ b/vp8/encoder/ratectrl.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_RATECTRL_H_

-#define VP8_ENCODER_RATECTRL_H_

+#ifndef VPX_VP8_ENCODER_RATECTRL_H_

+#define VPX_VP8_ENCODER_RATECTRL_H_

 #include "onyx_int.h"

@@ -37,4 +37,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_RATECTRL_H_

+#endif  // VPX_VP8_ENCODER_RATECTRL_H_

--- a/vp8/encoder/rdopt.h

+++ b/vp8/encoder/rdopt.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_RDOPT_H_

-#define VP8_ENCODER_RDOPT_H_

+#ifndef VPX_VP8_ENCODER_RDOPT_H_

+#define VPX_VP8_ENCODER_RDOPT_H_

 #include "./vpx_config.h"

@@ -123,4 +123,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_RDOPT_H_

+#endif  // VPX_VP8_ENCODER_RDOPT_H_

--- a/vp8/encoder/segmentation.h

+++ b/vp8/encoder/segmentation.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_SEGMENTATION_H_

-#define VP8_ENCODER_SEGMENTATION_H_

+#ifndef VPX_VP8_ENCODER_SEGMENTATION_H_

+#define VPX_VP8_ENCODER_SEGMENTATION_H_

 #include "string.h"

 #include "vp8/common/blockd.h"

@@ -26,4 +26,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_SEGMENTATION_H_

+#endif  // VPX_VP8_ENCODER_SEGMENTATION_H_

--- a/vp8/encoder/temporal_filter.h

+++ b/vp8/encoder/temporal_filter.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_TEMPORAL_FILTER_H_

-#define VP8_ENCODER_TEMPORAL_FILTER_H_

+#ifndef VPX_VP8_ENCODER_TEMPORAL_FILTER_H_

+#define VPX_VP8_ENCODER_TEMPORAL_FILTER_H_

 #ifdef __cplusplus

 extern "C" {

@@ -23,4 +23,4 @@

 }

 #endif

-#endif  // VP8_ENCODER_TEMPORAL_FILTER_H_

+#endif  // VPX_VP8_ENCODER_TEMPORAL_FILTER_H_

--- a/vp8/encoder/tokenize.h

+++ b/vp8/encoder/tokenize.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_TOKENIZE_H_

-#define VP8_ENCODER_TOKENIZE_H_

+#ifndef VPX_VP8_ENCODER_TOKENIZE_H_

+#define VPX_VP8_ENCODER_TOKENIZE_H_

 #include "vp8/common/entropy.h"

 #include "block.h"

@@ -53,4 +53,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_TOKENIZE_H_

+#endif  // VPX_VP8_ENCODER_TOKENIZE_H_

--- a/vp8/encoder/treewriter.h

+++ b/vp8/encoder/treewriter.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP8_ENCODER_TREEWRITER_H_

-#define VP8_ENCODER_TREEWRITER_H_

+#ifndef VPX_VP8_ENCODER_TREEWRITER_H_

+#define VPX_VP8_ENCODER_TREEWRITER_H_

 /* Trees map alphabets into huffman-like codes suitable for an arithmetic

    bit coder.  Timothy S Murphy  11 October 2004 */

@@ -99,4 +99,4 @@

 }  // extern "C"

 #endif

-#endif  // VP8_ENCODER_TREEWRITER_H_

+#endif  // VPX_VP8_ENCODER_TREEWRITER_H_

--- a/vp9/common/arm/neon/vp9_iht_neon.h

+++ b/vp9/common/arm/neon/vp9_iht_neon.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_ARM_NEON_VP9_IHT_NEON_H_

-#define VP9_COMMON_ARM_NEON_VP9_IHT_NEON_H_

+#ifndef VPX_VP9_COMMON_ARM_NEON_VP9_IHT_NEON_H_

+#define VPX_VP9_COMMON_ARM_NEON_VP9_IHT_NEON_H_

 #include <arm_neon.h>

@@ -269,4 +269,4 @@

   iht_1d cols, rows;  // vertical and horizontal

 } iht_2d;

-#endif  // VP9_COMMON_ARM_NEON_VP9_IHT_NEON_H_

+#endif  // VPX_VP9_COMMON_ARM_NEON_VP9_IHT_NEON_H_

--- a/vp9/common/vp9_alloccommon.h

+++ b/vp9/common/vp9_alloccommon.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_ALLOCCOMMON_H_

-#define VP9_COMMON_VP9_ALLOCCOMMON_H_

+#ifndef VPX_VP9_COMMON_VP9_ALLOCCOMMON_H_

+#define VPX_VP9_COMMON_VP9_ALLOCCOMMON_H_

 #define INVALID_IDX -1  // Invalid buffer index.

@@ -41,4 +41,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_ALLOCCOMMON_H_

+#endif  // VPX_VP9_COMMON_VP9_ALLOCCOMMON_H_

--- a/vp9/common/vp9_blockd.h

+++ b/vp9/common/vp9_blockd.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_BLOCKD_H_

-#define VP9_COMMON_VP9_BLOCKD_H_

+#ifndef VPX_VP9_COMMON_VP9_BLOCKD_H_

+#define VPX_VP9_COMMON_VP9_BLOCKD_H_

 #include "./vpx_config.h"

@@ -286,4 +286,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_BLOCKD_H_

+#endif  // VPX_VP9_COMMON_VP9_BLOCKD_H_

--- a/vp9/common/vp9_common.h

+++ b/vp9/common/vp9_common.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_COMMON_H_

-#define VP9_COMMON_VP9_COMMON_H_

+#ifndef VPX_VP9_COMMON_VP9_COMMON_H_

+#define VPX_VP9_COMMON_VP9_COMMON_H_

 /* Interface header for common constant data structures and lookup tables */

@@ -75,4 +75,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_COMMON_H_

+#endif  // VPX_VP9_COMMON_VP9_COMMON_H_

--- a/vp9/common/vp9_common_data.h

+++ b/vp9/common/vp9_common_data.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_COMMON_DATA_H_

-#define VP9_COMMON_VP9_COMMON_DATA_H_

+#ifndef VPX_VP9_COMMON_VP9_COMMON_DATA_H_

+#define VPX_VP9_COMMON_VP9_COMMON_DATA_H_

 #include "vp9/common/vp9_enums.h"

 #include "vpx/vpx_integer.h"

@@ -42,4 +42,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_COMMON_DATA_H_

+#endif  // VPX_VP9_COMMON_VP9_COMMON_DATA_H_

--- a/vp9/common/vp9_entropy.h

+++ b/vp9/common/vp9_entropy.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_ENTROPY_H_

-#define VP9_COMMON_VP9_ENTROPY_H_

+#ifndef VPX_VP9_COMMON_VP9_ENTROPY_H_

+#define VPX_VP9_COMMON_VP9_ENTROPY_H_

 #include "vpx/vpx_integer.h"

 #include "vpx_dsp/prob.h"

@@ -194,4 +194,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_ENTROPY_H_

+#endif  // VPX_VP9_COMMON_VP9_ENTROPY_H_

--- a/vp9/common/vp9_entropymode.h

+++ b/vp9/common/vp9_entropymode.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_ENTROPYMODE_H_

-#define VP9_COMMON_VP9_ENTROPYMODE_H_

+#ifndef VPX_VP9_COMMON_VP9_ENTROPYMODE_H_

+#define VPX_VP9_COMMON_VP9_ENTROPYMODE_H_

 #include "vp9/common/vp9_entropy.h"

 #include "vp9/common/vp9_entropymv.h"

@@ -104,4 +104,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_ENTROPYMODE_H_

+#endif  // VPX_VP9_COMMON_VP9_ENTROPYMODE_H_

--- a/vp9/common/vp9_entropymv.h

+++ b/vp9/common/vp9_entropymv.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_ENTROPYMV_H_

-#define VP9_COMMON_VP9_ENTROPYMV_H_

+#ifndef VPX_VP9_COMMON_VP9_ENTROPYMV_H_

+#define VPX_VP9_COMMON_VP9_ENTROPYMV_H_

 #include "./vpx_config.h"

@@ -133,4 +133,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_ENTROPYMV_H_

+#endif  // VPX_VP9_COMMON_VP9_ENTROPYMV_H_

--- a/vp9/common/vp9_enums.h

+++ b/vp9/common/vp9_enums.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_ENUMS_H_

-#define VP9_COMMON_VP9_ENUMS_H_

+#ifndef VPX_VP9_COMMON_VP9_ENUMS_H_

+#define VPX_VP9_COMMON_VP9_ENUMS_H_

 #include "./vpx_config.h"

 #include "vpx/vpx_integer.h"

@@ -140,4 +140,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_ENUMS_H_

+#endif  // VPX_VP9_COMMON_VP9_ENUMS_H_

--- a/vp9/common/vp9_filter.h

+++ b/vp9/common/vp9_filter.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_FILTER_H_

-#define VP9_COMMON_VP9_FILTER_H_

+#ifndef VPX_VP9_COMMON_VP9_FILTER_H_

+#define VPX_VP9_COMMON_VP9_FILTER_H_

 #include "./vpx_config.h"

 #include "vpx/vpx_integer.h"

@@ -38,4 +38,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_FILTER_H_

+#endif  // VPX_VP9_COMMON_VP9_FILTER_H_

--- a/vp9/common/vp9_frame_buffers.h

+++ b/vp9/common/vp9_frame_buffers.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_FRAME_BUFFERS_H_

-#define VP9_COMMON_VP9_FRAME_BUFFERS_H_

+#ifndef VPX_VP9_COMMON_VP9_FRAME_BUFFERS_H_

+#define VPX_VP9_COMMON_VP9_FRAME_BUFFERS_H_

 #include "vpx/vpx_frame_buffer.h"

 #include "vpx/vpx_integer.h"

@@ -50,4 +50,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_FRAME_BUFFERS_H_

+#endif  // VPX_VP9_COMMON_VP9_FRAME_BUFFERS_H_

--- a/vp9/common/vp9_idct.h

+++ b/vp9/common/vp9_idct.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_IDCT_H_

-#define VP9_COMMON_VP9_IDCT_H_

+#ifndef VPX_VP9_COMMON_VP9_IDCT_H_

+#define VPX_VP9_COMMON_VP9_IDCT_H_

 #include <assert.h>

@@ -78,4 +78,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_IDCT_H_

+#endif  // VPX_VP9_COMMON_VP9_IDCT_H_

--- a/vp9/common/vp9_loopfilter.h

+++ b/vp9/common/vp9_loopfilter.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_LOOPFILTER_H_

-#define VP9_COMMON_VP9_LOOPFILTER_H_

+#ifndef VPX_VP9_COMMON_VP9_LOOPFILTER_H_

+#define VPX_VP9_COMMON_VP9_LOOPFILTER_H_

 #include "vpx_ports/mem.h"

 #include "./vpx_config.h"

@@ -157,4 +157,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_LOOPFILTER_H_

+#endif  // VPX_VP9_COMMON_VP9_LOOPFILTER_H_

--- a/vp9/common/vp9_mfqe.h

+++ b/vp9/common/vp9_mfqe.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_MFQE_H_

-#define VP9_COMMON_VP9_MFQE_H_

+#ifndef VPX_VP9_COMMON_VP9_MFQE_H_

+#define VPX_VP9_COMMON_VP9_MFQE_H_

 #ifdef __cplusplus

 extern "C" {

@@ -28,4 +28,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_MFQE_H_

+#endif  // VPX_VP9_COMMON_VP9_MFQE_H_

--- a/vp9/common/vp9_mv.h

+++ b/vp9/common/vp9_mv.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_MV_H_

-#define VP9_COMMON_VP9_MV_H_

+#ifndef VPX_VP9_COMMON_VP9_MV_H_

+#define VPX_VP9_COMMON_VP9_MV_H_

 #include "vpx/vpx_integer.h"

@@ -52,4 +52,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_MV_H_

+#endif  // VPX_VP9_COMMON_VP9_MV_H_

--- a/vp9/common/vp9_mvref_common.h

+++ b/vp9/common/vp9_mvref_common.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_MVREF_COMMON_H_

-#define VP9_COMMON_VP9_MVREF_COMMON_H_

+#ifndef VPX_VP9_COMMON_VP9_MVREF_COMMON_H_

+#define VPX_VP9_COMMON_VP9_MVREF_COMMON_H_

 #include "vp9/common/vp9_onyxc_int.h"

 #include "vp9/common/vp9_blockd.h"

@@ -320,4 +320,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_MVREF_COMMON_H_

+#endif  // VPX_VP9_COMMON_VP9_MVREF_COMMON_H_

--- a/vp9/common/vp9_onyxc_int.h

+++ b/vp9/common/vp9_onyxc_int.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_ONYXC_INT_H_

-#define VP9_COMMON_VP9_ONYXC_INT_H_

+#ifndef VPX_VP9_COMMON_VP9_ONYXC_INT_H_

+#define VPX_VP9_COMMON_VP9_ONYXC_INT_H_

 #include "./vpx_config.h"

 #include "vpx/internal/vpx_codec_internal.h"

@@ -415,4 +415,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_ONYXC_INT_H_

+#endif  // VPX_VP9_COMMON_VP9_ONYXC_INT_H_

--- a/vp9/common/vp9_postproc.h

+++ b/vp9/common/vp9_postproc.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_POSTPROC_H_

-#define VP9_COMMON_VP9_POSTPROC_H_

+#ifndef VPX_VP9_COMMON_VP9_POSTPROC_H_

+#define VPX_VP9_COMMON_VP9_POSTPROC_H_

 #include "vpx_ports/mem.h"

 #include "vpx_scale/yv12config.h"

@@ -50,4 +50,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_POSTPROC_H_

+#endif  // VPX_VP9_COMMON_VP9_POSTPROC_H_

--- a/vp9/common/vp9_ppflags.h

+++ b/vp9/common/vp9_ppflags.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_PPFLAGS_H_

-#define VP9_COMMON_VP9_PPFLAGS_H_

+#ifndef VPX_VP9_COMMON_VP9_PPFLAGS_H_

+#define VPX_VP9_COMMON_VP9_PPFLAGS_H_

 #ifdef __cplusplus

 extern "C" {

@@ -33,4 +33,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_PPFLAGS_H_

+#endif  // VPX_VP9_COMMON_VP9_PPFLAGS_H_

--- a/vp9/common/vp9_pred_common.h

+++ b/vp9/common/vp9_pred_common.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_PRED_COMMON_H_

-#define VP9_COMMON_VP9_PRED_COMMON_H_

+#ifndef VPX_VP9_COMMON_VP9_PRED_COMMON_H_

+#define VPX_VP9_COMMON_VP9_PRED_COMMON_H_

 #include "vp9/common/vp9_blockd.h"

 #include "vp9/common/vp9_onyxc_int.h"

@@ -190,4 +190,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_PRED_COMMON_H_

+#endif  // VPX_VP9_COMMON_VP9_PRED_COMMON_H_

--- a/vp9/common/vp9_quant_common.h

+++ b/vp9/common/vp9_quant_common.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_QUANT_COMMON_H_

-#define VP9_COMMON_VP9_QUANT_COMMON_H_

+#ifndef VPX_VP9_COMMON_VP9_QUANT_COMMON_H_

+#define VPX_VP9_COMMON_VP9_QUANT_COMMON_H_

 #include "vpx/vpx_codec.h"

 #include "vp9/common/vp9_seg_common.h"

@@ -33,4 +33,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_QUANT_COMMON_H_

+#endif  // VPX_VP9_COMMON_VP9_QUANT_COMMON_H_

--- a/vp9/common/vp9_reconinter.h

+++ b/vp9/common/vp9_reconinter.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_RECONINTER_H_

-#define VP9_COMMON_VP9_RECONINTER_H_

+#ifndef VPX_VP9_COMMON_VP9_RECONINTER_H_

+#define VPX_VP9_COMMON_VP9_RECONINTER_H_

 #include "vp9/common/vp9_filter.h"

 #include "vp9/common/vp9_onyxc_int.h"

@@ -103,4 +103,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_RECONINTER_H_

+#endif  // VPX_VP9_COMMON_VP9_RECONINTER_H_

--- a/vp9/common/vp9_reconintra.h

+++ b/vp9/common/vp9_reconintra.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_RECONINTRA_H_

-#define VP9_COMMON_VP9_RECONINTRA_H_

+#ifndef VPX_VP9_COMMON_VP9_RECONINTRA_H_

+#define VPX_VP9_COMMON_VP9_RECONINTRA_H_

 #include "vpx/vpx_integer.h"

 #include "vp9/common/vp9_blockd.h"

@@ -28,4 +28,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_RECONINTRA_H_

+#endif  // VPX_VP9_COMMON_VP9_RECONINTRA_H_

--- a/vp9/common/vp9_scale.h

+++ b/vp9/common/vp9_scale.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_SCALE_H_

-#define VP9_COMMON_VP9_SCALE_H_

+#ifndef VPX_VP9_COMMON_VP9_SCALE_H_

+#define VPX_VP9_COMMON_VP9_SCALE_H_

 #include "vp9/common/vp9_mv.h"

 #include "vpx_dsp/vpx_convolve.h"

@@ -68,4 +68,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_SCALE_H_

+#endif  // VPX_VP9_COMMON_VP9_SCALE_H_

--- a/vp9/common/vp9_scan.h

+++ b/vp9/common/vp9_scan.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_SCAN_H_

-#define VP9_COMMON_VP9_SCAN_H_

+#ifndef VPX_VP9_COMMON_VP9_SCAN_H_

+#define VPX_VP9_COMMON_VP9_SCAN_H_

 #include "vpx/vpx_integer.h"

 #include "vpx_ports/mem.h"

@@ -55,4 +55,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_SCAN_H_

+#endif  // VPX_VP9_COMMON_VP9_SCAN_H_

--- a/vp9/common/vp9_seg_common.h

+++ b/vp9/common/vp9_seg_common.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_SEG_COMMON_H_

-#define VP9_COMMON_VP9_SEG_COMMON_H_

+#ifndef VPX_VP9_COMMON_VP9_SEG_COMMON_H_

+#define VPX_VP9_COMMON_VP9_SEG_COMMON_H_

 #include "vpx_dsp/prob.h"

@@ -78,4 +78,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_SEG_COMMON_H_

+#endif  // VPX_VP9_COMMON_VP9_SEG_COMMON_H_

--- a/vp9/common/vp9_thread_common.h

+++ b/vp9/common/vp9_thread_common.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_THREAD_COMMON_H_

-#define VP9_COMMON_VP9_THREAD_COMMON_H_

+#ifndef VPX_VP9_COMMON_VP9_THREAD_COMMON_H_

+#define VPX_VP9_COMMON_VP9_THREAD_COMMON_H_

 #include "./vpx_config.h"

 #include "vp9/common/vp9_loopfilter.h"

 #include "vpx_util/vpx_thread.h"

@@ -78,4 +78,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_THREAD_COMMON_H_

+#endif  // VPX_VP9_COMMON_VP9_THREAD_COMMON_H_

--- a/vp9/common/vp9_tile_common.h

+++ b/vp9/common/vp9_tile_common.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_VP9_TILE_COMMON_H_

-#define VP9_COMMON_VP9_TILE_COMMON_H_

+#ifndef VPX_VP9_COMMON_VP9_TILE_COMMON_H_

+#define VPX_VP9_COMMON_VP9_TILE_COMMON_H_

 #ifdef __cplusplus

 extern "C" {

@@ -37,4 +37,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_VP9_TILE_COMMON_H_

+#endif  // VPX_VP9_COMMON_VP9_TILE_COMMON_H_

--- a/vp9/decoder/vp9_decodeframe.h

+++ b/vp9/decoder/vp9_decodeframe.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_DECODER_VP9_DECODEFRAME_H_

-#define VP9_DECODER_VP9_DECODEFRAME_H_

+#ifndef VPX_VP9_DECODER_VP9_DECODEFRAME_H_

+#define VPX_VP9_DECODER_VP9_DECODEFRAME_H_

 #ifdef __cplusplus

 extern "C" {

@@ -32,4 +32,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_DECODER_VP9_DECODEFRAME_H_

+#endif  // VPX_VP9_DECODER_VP9_DECODEFRAME_H_

--- a/vp9/decoder/vp9_decodemv.h

+++ b/vp9/decoder/vp9_decodemv.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_DECODER_VP9_DECODEMV_H_

-#define VP9_DECODER_VP9_DECODEMV_H_

+#ifndef VPX_VP9_DECODER_VP9_DECODEMV_H_

+#define VPX_VP9_DECODER_VP9_DECODEMV_H_

 #include "vpx_dsp/bitreader.h"

@@ -26,4 +26,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_DECODER_VP9_DECODEMV_H_

+#endif  // VPX_VP9_DECODER_VP9_DECODEMV_H_

--- a/vp9/decoder/vp9_decoder.h

+++ b/vp9/decoder/vp9_decoder.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_DECODER_VP9_DECODER_H_

-#define VP9_DECODER_VP9_DECODER_H_

+#ifndef VPX_VP9_DECODER_VP9_DECODER_H_

+#define VPX_VP9_DECODER_VP9_DECODER_H_

 #include "./vpx_config.h"

@@ -133,4 +133,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_DECODER_VP9_DECODER_H_

+#endif  // VPX_VP9_DECODER_VP9_DECODER_H_

--- a/vp9/decoder/vp9_detokenize.h

+++ b/vp9/decoder/vp9_detokenize.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_DECODER_VP9_DETOKENIZE_H_

-#define VP9_DECODER_VP9_DETOKENIZE_H_

+#ifndef VPX_VP9_DECODER_VP9_DETOKENIZE_H_

+#define VPX_VP9_DECODER_VP9_DETOKENIZE_H_

 #include "vpx_dsp/bitreader.h"

 #include "vp9/decoder/vp9_decoder.h"

@@ -27,4 +27,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_DECODER_VP9_DETOKENIZE_H_

+#endif  // VPX_VP9_DECODER_VP9_DETOKENIZE_H_

--- a/vp9/decoder/vp9_dsubexp.h

+++ b/vp9/decoder/vp9_dsubexp.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_DECODER_VP9_DSUBEXP_H_

-#define VP9_DECODER_VP9_DSUBEXP_H_

+#ifndef VPX_VP9_DECODER_VP9_DSUBEXP_H_

+#define VPX_VP9_DECODER_VP9_DSUBEXP_H_

 #include "vpx_dsp/bitreader.h"

@@ -23,4 +23,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_DECODER_VP9_DSUBEXP_H_

+#endif  // VPX_VP9_DECODER_VP9_DSUBEXP_H_

--- a/vp9/encoder/mips/msa/vp9_fdct_msa.h

+++ b/vp9/encoder/mips/msa/vp9_fdct_msa.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_MIPS_MSA_VP9_FDCT_MSA_H_

-#define VP9_ENCODER_MIPS_MSA_VP9_FDCT_MSA_H_

+#ifndef VPX_VP9_ENCODER_MIPS_MSA_VP9_FDCT_MSA_H_

+#define VPX_VP9_ENCODER_MIPS_MSA_VP9_FDCT_MSA_H_

 #include "vpx_dsp/mips/fwd_txfm_msa.h"

 #include "vpx_dsp/mips/txfm_macros_msa.h"

@@ -113,4 +113,4 @@

     PCKEV_H4_SH(in0_r_m, in0_r_m, in1_r_m, in1_r_m, s2_m, s2_m, s3_m, s3_m, \

                 out0, out1, out2, out3);                                    \

   }

-#endif /* VP9_ENCODER_MIPS_MSA_VP9_FDCT_MSA_H_ */

+#endif  // VPX_VP9_ENCODER_MIPS_MSA_VP9_FDCT_MSA_H_

--- a/vp9/encoder/vp9_alt_ref_aq.h

+++ b/vp9/encoder/vp9_alt_ref_aq.h

@@ -15,8 +15,8 @@

  *  for altref frames.  Go to alt_ref_aq_private.h for implmentation details.

  */

-#ifndef VP9_ENCODER_VP9_ALT_REF_AQ_H_

-#define VP9_ENCODER_VP9_ALT_REF_AQ_H_

+#ifndef VPX_VP9_ENCODER_VP9_ALT_REF_AQ_H_

+#define VPX_VP9_ENCODER_VP9_ALT_REF_AQ_H_

 #include "vpx/vpx_integer.h"

@@ -124,4 +124,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_ALT_REF_AQ_H_

+#endif  // VPX_VP9_ENCODER_VP9_ALT_REF_AQ_H_

--- a/vp9/encoder/vp9_aq_360.h

+++ b/vp9/encoder/vp9_aq_360.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_AQ_360_H_

-#define VP9_ENCODER_VP9_AQ_360_H_

+#ifndef VPX_VP9_ENCODER_VP9_AQ_360_H_

+#define VPX_VP9_ENCODER_VP9_AQ_360_H_

 #include "vp9/encoder/vp9_encoder.h"

@@ -24,4 +24,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_AQ_VARIANCE_H_

+#endif  // VPX_VP9_ENCODER_VP9_AQ_360_H_

--- a/vp9/encoder/vp9_aq_complexity.h

+++ b/vp9/encoder/vp9_aq_complexity.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_AQ_COMPLEXITY_H_

-#define VP9_ENCODER_VP9_AQ_COMPLEXITY_H_

+#ifndef VPX_VP9_ENCODER_VP9_AQ_COMPLEXITY_H_

+#define VPX_VP9_ENCODER_VP9_AQ_COMPLEXITY_H_

 #ifdef __cplusplus

 extern "C" {

@@ -33,4 +33,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_AQ_COMPLEXITY_H_

+#endif  // VPX_VP9_ENCODER_VP9_AQ_COMPLEXITY_H_

--- a/vp9/encoder/vp9_aq_cyclicrefresh.h

+++ b/vp9/encoder/vp9_aq_cyclicrefresh.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_AQ_CYCLICREFRESH_H_

-#define VP9_ENCODER_VP9_AQ_CYCLICREFRESH_H_

+#ifndef VPX_VP9_ENCODER_VP9_AQ_CYCLICREFRESH_H_

+#define VPX_VP9_ENCODER_VP9_AQ_CYCLICREFRESH_H_

 #include "vpx/vpx_integer.h"

 #include "vp9/common/vp9_blockd.h"

@@ -147,4 +147,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_AQ_CYCLICREFRESH_H_

+#endif  // VPX_VP9_ENCODER_VP9_AQ_CYCLICREFRESH_H_

--- a/vp9/encoder/vp9_aq_variance.h

+++ b/vp9/encoder/vp9_aq_variance.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_AQ_VARIANCE_H_

-#define VP9_ENCODER_VP9_AQ_VARIANCE_H_

+#ifndef VPX_VP9_ENCODER_VP9_AQ_VARIANCE_H_

+#define VPX_VP9_ENCODER_VP9_AQ_VARIANCE_H_

 #include "vp9/encoder/vp9_encoder.h"

@@ -31,4 +31,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_AQ_VARIANCE_H_

+#endif  // VPX_VP9_ENCODER_VP9_AQ_VARIANCE_H_

--- a/vp9/encoder/vp9_bitstream.h

+++ b/vp9/encoder/vp9_bitstream.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_BITSTREAM_H_

-#define VP9_ENCODER_VP9_BITSTREAM_H_

+#ifndef VPX_VP9_ENCODER_VP9_BITSTREAM_H_

+#define VPX_VP9_ENCODER_VP9_BITSTREAM_H_

 #ifdef __cplusplus

 extern "C" {

@@ -46,4 +46,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_BITSTREAM_H_

+#endif  // VPX_VP9_ENCODER_VP9_BITSTREAM_H_

--- a/vp9/encoder/vp9_block.h

+++ b/vp9/encoder/vp9_block.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_BLOCK_H_

-#define VP9_ENCODER_VP9_BLOCK_H_

+#ifndef VPX_VP9_ENCODER_VP9_BLOCK_H_

+#define VPX_VP9_ENCODER_VP9_BLOCK_H_

 #include "vpx_util/vpx_thread.h"

@@ -214,4 +214,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_BLOCK_H_

+#endif  // VPX_VP9_ENCODER_VP9_BLOCK_H_

--- a/vp9/encoder/vp9_context_tree.h

+++ b/vp9/encoder/vp9_context_tree.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_CONTEXT_TREE_H_

-#define VP9_ENCODER_VP9_CONTEXT_TREE_H_

+#ifndef VPX_VP9_ENCODER_VP9_CONTEXT_TREE_H_

+#define VPX_VP9_ENCODER_VP9_CONTEXT_TREE_H_

 #include "vp9/common/vp9_blockd.h"

 #include "vp9/encoder/vp9_block.h"

@@ -100,4 +100,4 @@

 }  // extern "C"

 #endif

-#endif /* VP9_ENCODER_VP9_CONTEXT_TREE_H_ */

+#endif  // VPX_VP9_ENCODER_VP9_CONTEXT_TREE_H_

--- a/vp9/encoder/vp9_cost.h

+++ b/vp9/encoder/vp9_cost.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_COST_H_

-#define VP9_ENCODER_VP9_COST_H_

+#ifndef VPX_VP9_ENCODER_VP9_COST_H_

+#define VPX_VP9_ENCODER_VP9_COST_H_

 #include "vpx_dsp/prob.h"

 #include "vpx/vpx_integer.h"

@@ -55,4 +55,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_COST_H_

+#endif  // VPX_VP9_ENCODER_VP9_COST_H_

--- a/vp9/encoder/vp9_denoiser.h

+++ b/vp9/encoder/vp9_denoiser.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_DENOISER_H_

-#define VP9_ENCODER_DENOISER_H_

+#ifndef VPX_VP9_ENCODER_VP9_DENOISER_H_

+#define VPX_VP9_ENCODER_VP9_DENOISER_H_

 #include "vp9/encoder/vp9_block.h"

 #include "vp9/encoder/vp9_skin_detection.h"

@@ -126,4 +126,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_DENOISER_H_

+#endif  // VPX_VP9_ENCODER_VP9_DENOISER_H_

--- a/vp9/encoder/vp9_encodeframe.h

+++ b/vp9/encoder/vp9_encodeframe.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_ENCODEFRAME_H_

-#define VP9_ENCODER_VP9_ENCODEFRAME_H_

+#ifndef VPX_VP9_ENCODER_VP9_ENCODEFRAME_H_

+#define VPX_VP9_ENCODER_VP9_ENCODEFRAME_H_

 #include "vpx/vpx_integer.h"

@@ -49,4 +49,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_ENCODEFRAME_H_

+#endif  // VPX_VP9_ENCODER_VP9_ENCODEFRAME_H_

--- a/vp9/encoder/vp9_encodemb.h

+++ b/vp9/encoder/vp9_encodemb.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_ENCODEMB_H_

-#define VP9_ENCODER_VP9_ENCODEMB_H_

+#ifndef VPX_VP9_ENCODER_VP9_ENCODEMB_H_

+#define VPX_VP9_ENCODER_VP9_ENCODEMB_H_

 #include "./vpx_config.h"

 #include "vp9/encoder/vp9_block.h"

@@ -48,4 +48,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_ENCODEMB_H_

+#endif  // VPX_VP9_ENCODER_VP9_ENCODEMB_H_

--- a/vp9/encoder/vp9_encodemv.h

+++ b/vp9/encoder/vp9_encodemv.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_ENCODEMV_H_

-#define VP9_ENCODER_VP9_ENCODEMV_H_

+#ifndef VPX_VP9_ENCODER_VP9_ENCODEMV_H_

+#define VPX_VP9_ENCODER_VP9_ENCODEMV_H_

 #include "vp9/encoder/vp9_encoder.h"

@@ -35,4 +35,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_ENCODEMV_H_

+#endif  // VPX_VP9_ENCODER_VP9_ENCODEMV_H_

--- a/vp9/encoder/vp9_encoder.h

+++ b/vp9/encoder/vp9_encoder.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_ENCODER_H_

-#define VP9_ENCODER_VP9_ENCODER_H_

+#ifndef VPX_VP9_ENCODER_VP9_ENCODER_H_

+#define VPX_VP9_ENCODER_VP9_ENCODER_H_

 #include <stdio.h>

@@ -1008,4 +1008,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_ENCODER_H_

+#endif  // VPX_VP9_ENCODER_VP9_ENCODER_H_

--- a/vp9/encoder/vp9_ethread.h

+++ b/vp9/encoder/vp9_ethread.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_ETHREAD_H_

-#define VP9_ENCODER_VP9_ETHREAD_H_

+#ifndef VPX_VP9_ENCODER_VP9_ETHREAD_H_

+#define VPX_VP9_ENCODER_VP9_ETHREAD_H_

 #ifdef __cplusplus

 extern "C" {

@@ -69,4 +69,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_ETHREAD_H_

+#endif  // VPX_VP9_ENCODER_VP9_ETHREAD_H_

--- a/vp9/encoder/vp9_extend.h

+++ b/vp9/encoder/vp9_extend.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_EXTEND_H_

-#define VP9_ENCODER_VP9_EXTEND_H_

+#ifndef VPX_VP9_ENCODER_VP9_EXTEND_H_

+#define VPX_VP9_ENCODER_VP9_EXTEND_H_

 #include "vpx_scale/yv12config.h"

 #include "vpx/vpx_integer.h"

@@ -28,4 +28,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_EXTEND_H_

+#endif  // VPX_VP9_ENCODER_VP9_EXTEND_H_

--- a/vp9/encoder/vp9_firstpass.h

+++ b/vp9/encoder/vp9_firstpass.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_FIRSTPASS_H_

-#define VP9_ENCODER_VP9_FIRSTPASS_H_

+#ifndef VPX_VP9_ENCODER_VP9_FIRSTPASS_H_

+#define VPX_VP9_ENCODER_VP9_FIRSTPASS_H_

 #include <assert.h>

@@ -235,4 +235,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_FIRSTPASS_H_

+#endif  // VPX_VP9_ENCODER_VP9_FIRSTPASS_H_

--- a/vp9/encoder/vp9_job_queue.h

+++ b/vp9/encoder/vp9_job_queue.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_JOB_QUEUE_H_

-#define VP9_ENCODER_VP9_JOB_QUEUE_H_

+#ifndef VPX_VP9_ENCODER_VP9_JOB_QUEUE_H_

+#define VPX_VP9_ENCODER_VP9_JOB_QUEUE_H_

 typedef enum {

   FIRST_PASS_JOB,

@@ -43,4 +43,4 @@

   int num_jobs_acquired;

 } JobQueueHandle;

-#endif  // VP9_ENCODER_VP9_JOB_QUEUE_H_

+#endif  // VPX_VP9_ENCODER_VP9_JOB_QUEUE_H_

--- a/vp9/encoder/vp9_lookahead.h

+++ b/vp9/encoder/vp9_lookahead.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_LOOKAHEAD_H_

-#define VP9_ENCODER_VP9_LOOKAHEAD_H_

+#ifndef VPX_VP9_ENCODER_VP9_LOOKAHEAD_H_

+#define VPX_VP9_ENCODER_VP9_LOOKAHEAD_H_

 #include "vpx_scale/yv12config.h"

 #include "vpx/vpx_encoder.h"

@@ -111,4 +111,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_LOOKAHEAD_H_

+#endif  // VPX_VP9_ENCODER_VP9_LOOKAHEAD_H_

--- a/vp9/encoder/vp9_mbgraph.h

+++ b/vp9/encoder/vp9_mbgraph.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_MBGRAPH_H_

-#define VP9_ENCODER_VP9_MBGRAPH_H_

+#ifndef VPX_VP9_ENCODER_VP9_MBGRAPH_H_

+#define VPX_VP9_ENCODER_VP9_MBGRAPH_H_

 #ifdef __cplusplus

 extern "C" {

@@ -37,4 +37,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_MBGRAPH_H_

+#endif  // VPX_VP9_ENCODER_VP9_MBGRAPH_H_

--- a/vp9/encoder/vp9_mcomp.h

+++ b/vp9/encoder/vp9_mcomp.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_MCOMP_H_

-#define VP9_ENCODER_VP9_MCOMP_H_

+#ifndef VPX_VP9_ENCODER_VP9_MCOMP_H_

+#define VPX_VP9_ENCODER_VP9_MCOMP_H_

 #include "vp9/encoder/vp9_block.h"

 #include "vpx_dsp/variance.h"

@@ -123,4 +123,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_MCOMP_H_

+#endif  // VPX_VP9_ENCODER_VP9_MCOMP_H_

--- a/vp9/encoder/vp9_multi_thread.h

+++ b/vp9/encoder/vp9_multi_thread.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_MULTI_THREAD_H

-#define VP9_ENCODER_VP9_MULTI_THREAD_H

+#ifndef VPX_VP9_ENCODER_VP9_MULTI_THREAD_H_

+#define VPX_VP9_ENCODER_VP9_MULTI_THREAD_H_

 #include "vp9/encoder/vp9_encoder.h"

 #include "vp9/encoder/vp9_job_queue.h"

@@ -38,4 +38,4 @@

                               int *tile_completion_status, int *cur_tile_id,

                               int tile_cols);

-#endif  // VP9_ENCODER_VP9_MULTI_THREAD_H

+#endif  // VPX_VP9_ENCODER_VP9_MULTI_THREAD_H_

--- a/vp9/encoder/vp9_noise_estimate.h

+++ b/vp9/encoder/vp9_noise_estimate.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_NOISE_ESTIMATE_H_

-#define VP9_ENCODER_NOISE_ESTIMATE_H_

+#ifndef VPX_VP9_ENCODER_VP9_NOISE_ESTIMATE_H_

+#define VPX_VP9_ENCODER_VP9_NOISE_ESTIMATE_H_

 #include "vp9/encoder/vp9_block.h"

 #include "vp9/encoder/vp9_skin_detection.h"

@@ -48,4 +48,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_NOISE_ESTIMATE_H_

+#endif  // VPX_VP9_ENCODER_VP9_NOISE_ESTIMATE_H_

--- a/vp9/encoder/vp9_partition_models.h

+++ b/vp9/encoder/vp9_partition_models.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_PARTITION_MODELS_H_

-#define VP9_ENCODER_VP9_PARTITION_MODELS_H_

+#ifndef VPX_VP9_ENCODER_VP9_PARTITION_MODELS_H_

+#define VPX_VP9_ENCODER_VP9_PARTITION_MODELS_H_

 #ifdef __cplusplus

 extern "C" {

@@ -865,4 +865,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_PARTITION_MODELS_H_

+#endif  // VPX_VP9_ENCODER_VP9_PARTITION_MODELS_H_

--- a/vp9/encoder/vp9_picklpf.h

+++ b/vp9/encoder/vp9_picklpf.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_PICKLPF_H_

-#define VP9_ENCODER_VP9_PICKLPF_H_

+#ifndef VPX_VP9_ENCODER_VP9_PICKLPF_H_

+#define VPX_VP9_ENCODER_VP9_PICKLPF_H_

 #ifdef __cplusplus

 extern "C" {

@@ -26,4 +26,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_PICKLPF_H_

+#endif  // VPX_VP9_ENCODER_VP9_PICKLPF_H_

--- a/vp9/encoder/vp9_pickmode.h

+++ b/vp9/encoder/vp9_pickmode.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_PICKMODE_H_

-#define VP9_ENCODER_VP9_PICKMODE_H_

+#ifndef VPX_VP9_ENCODER_VP9_PICKMODE_H_

+#define VPX_VP9_ENCODER_VP9_PICKMODE_H_

 #include "vp9/encoder/vp9_encoder.h"

@@ -32,4 +32,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_PICKMODE_H_

+#endif  // VPX_VP9_ENCODER_VP9_PICKMODE_H_

--- a/vp9/encoder/vp9_quantize.h

+++ b/vp9/encoder/vp9_quantize.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_QUANTIZE_H_

-#define VP9_ENCODER_VP9_QUANTIZE_H_

+#ifndef VPX_VP9_ENCODER_VP9_QUANTIZE_H_

+#define VPX_VP9_ENCODER_VP9_QUANTIZE_H_

 #include "./vpx_config.h"

 #include "vp9/encoder/vp9_block.h"

@@ -59,4 +59,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_QUANTIZE_H_

+#endif  // VPX_VP9_ENCODER_VP9_QUANTIZE_H_

--- a/vp9/encoder/vp9_ratectrl.h

+++ b/vp9/encoder/vp9_ratectrl.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_RATECTRL_H_

-#define VP9_ENCODER_VP9_RATECTRL_H_

+#ifndef VPX_VP9_ENCODER_VP9_RATECTRL_H_

+#define VPX_VP9_ENCODER_VP9_RATECTRL_H_

 #include "vpx/vpx_codec.h"

 #include "vpx/vpx_integer.h"

@@ -312,4 +312,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_RATECTRL_H_

+#endif  // VPX_VP9_ENCODER_VP9_RATECTRL_H_

--- a/vp9/encoder/vp9_rd.h

+++ b/vp9/encoder/vp9_rd.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_RD_H_

-#define VP9_ENCODER_VP9_RD_H_

+#ifndef VPX_VP9_ENCODER_VP9_RD_H_

+#define VPX_VP9_ENCODER_VP9_RD_H_

 #include <limits.h>

@@ -219,4 +219,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_RD_H_

+#endif  // VPX_VP9_ENCODER_VP9_RD_H_

--- a/vp9/encoder/vp9_rdopt.h

+++ b/vp9/encoder/vp9_rdopt.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_RDOPT_H_

-#define VP9_ENCODER_VP9_RDOPT_H_

+#ifndef VPX_VP9_ENCODER_VP9_RDOPT_H_

+#define VPX_VP9_ENCODER_VP9_RDOPT_H_

 #include "vp9/common/vp9_blockd.h"

@@ -56,4 +56,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_RDOPT_H_

+#endif  // VPX_VP9_ENCODER_VP9_RDOPT_H_

--- a/vp9/encoder/vp9_resize.h

+++ b/vp9/encoder/vp9_resize.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_RESIZE_H_

-#define VP9_ENCODER_VP9_RESIZE_H_

+#ifndef VPX_VP9_ENCODER_VP9_RESIZE_H_

+#define VPX_VP9_ENCODER_VP9_RESIZE_H_

 #include <stdio.h>

 #include "vpx/vpx_integer.h"

@@ -65,4 +65,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_RESIZE_H_

+#endif  // VPX_VP9_ENCODER_VP9_RESIZE_H_

--- a/vp9/encoder/vp9_segmentation.h

+++ b/vp9/encoder/vp9_segmentation.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_SEGMENTATION_H_

-#define VP9_ENCODER_VP9_SEGMENTATION_H_

+#ifndef VPX_VP9_ENCODER_VP9_SEGMENTATION_H_

+#define VPX_VP9_ENCODER_VP9_SEGMENTATION_H_

 #include "vp9/common/vp9_blockd.h"

 #include "vp9/encoder/vp9_encoder.h"

@@ -47,4 +47,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_SEGMENTATION_H_

+#endif  // VPX_VP9_ENCODER_VP9_SEGMENTATION_H_

--- a/vp9/encoder/vp9_skin_detection.h

+++ b/vp9/encoder/vp9_skin_detection.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_SKIN_MAP_H_

-#define VP9_ENCODER_VP9_SKIN_MAP_H_

+#ifndef VPX_VP9_ENCODER_VP9_SKIN_DETECTION_H_

+#define VPX_VP9_ENCODER_VP9_SKIN_DETECTION_H_

 #include "vp9/common/vp9_blockd.h"

 #include "vpx_dsp/skin_detection.h"

@@ -37,4 +37,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_SKIN_MAP_H_

+#endif  // VPX_VP9_ENCODER_VP9_SKIN_DETECTION_H_

--- a/vp9/encoder/vp9_speed_features.h

+++ b/vp9/encoder/vp9_speed_features.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_SPEED_FEATURES_H_

-#define VP9_ENCODER_VP9_SPEED_FEATURES_H_

+#ifndef VPX_VP9_ENCODER_VP9_SPEED_FEATURES_H_

+#define VPX_VP9_ENCODER_VP9_SPEED_FEATURES_H_

 #include "vp9/common/vp9_enums.h"

@@ -587,4 +587,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_SPEED_FEATURES_H_

+#endif  // VPX_VP9_ENCODER_VP9_SPEED_FEATURES_H_

--- a/vp9/encoder/vp9_subexp.h

+++ b/vp9/encoder/vp9_subexp.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_SUBEXP_H_

-#define VP9_ENCODER_VP9_SUBEXP_H_

+#ifndef VPX_VP9_ENCODER_VP9_SUBEXP_H_

+#define VPX_VP9_ENCODER_VP9_SUBEXP_H_

 #ifdef __cplusplus

 extern "C" {

@@ -37,4 +37,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_SUBEXP_H_

+#endif  // VPX_VP9_ENCODER_VP9_SUBEXP_H_

--- a/vp9/encoder/vp9_svc_layercontext.h

+++ b/vp9/encoder/vp9_svc_layercontext.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_SVC_LAYERCONTEXT_H_

-#define VP9_ENCODER_VP9_SVC_LAYERCONTEXT_H_

+#ifndef VPX_VP9_ENCODER_VP9_SVC_LAYERCONTEXT_H_

+#define VPX_VP9_ENCODER_VP9_SVC_LAYERCONTEXT_H_

 #include "vpx/vpx_encoder.h"

@@ -254,4 +254,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_SVC_LAYERCONTEXT_

+#endif  // VPX_VP9_ENCODER_VP9_SVC_LAYERCONTEXT_H_

--- a/vp9/encoder/vp9_temporal_filter.h

+++ b/vp9/encoder/vp9_temporal_filter.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_TEMPORAL_FILTER_H_

-#define VP9_ENCODER_VP9_TEMPORAL_FILTER_H_

+#ifndef VPX_VP9_ENCODER_VP9_TEMPORAL_FILTER_H_

+#define VPX_VP9_ENCODER_VP9_TEMPORAL_FILTER_H_

 #ifdef __cplusplus

 extern "C" {

@@ -28,4 +28,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_TEMPORAL_FILTER_H_

+#endif  // VPX_VP9_ENCODER_VP9_TEMPORAL_FILTER_H_

--- a/vp9/encoder/vp9_tokenize.h

+++ b/vp9/encoder/vp9_tokenize.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_TOKENIZE_H_

-#define VP9_ENCODER_VP9_TOKENIZE_H_

+#ifndef VPX_VP9_ENCODER_VP9_TOKENIZE_H_

+#define VPX_VP9_ENCODER_VP9_TOKENIZE_H_

 #include "vp9/common/vp9_entropy.h"

@@ -127,4 +127,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_TOKENIZE_H_

+#endif  // VPX_VP9_ENCODER_VP9_TOKENIZE_H_

--- a/vp9/encoder/vp9_treewriter.h

+++ b/vp9/encoder/vp9_treewriter.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_ENCODER_VP9_TREEWRITER_H_

-#define VP9_ENCODER_VP9_TREEWRITER_H_

+#ifndef VPX_VP9_ENCODER_VP9_TREEWRITER_H_

+#define VPX_VP9_ENCODER_VP9_TREEWRITER_H_

 #include "vpx_dsp/bitwriter.h"

@@ -48,4 +48,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_ENCODER_VP9_TREEWRITER_H_

+#endif  // VPX_VP9_ENCODER_VP9_TREEWRITER_H_

--- a/vp9/vp9_dx_iface.h

+++ b/vp9/vp9_dx_iface.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_VP9_DX_IFACE_H_

-#define VP9_VP9_DX_IFACE_H_

+#ifndef VPX_VP9_VP9_DX_IFACE_H_

+#define VPX_VP9_VP9_DX_IFACE_H_

 #include "vp9/decoder/vp9_decoder.h"

@@ -48,4 +48,4 @@

   int row_mt;

 };

-#endif  // VP9_VP9_DX_IFACE_H_

+#endif  // VPX_VP9_VP9_DX_IFACE_H_

--- a/vp9/vp9_iface_common.h

+++ b/vp9/vp9_iface_common.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_VP9_IFACE_COMMON_H_

-#define VP9_VP9_IFACE_COMMON_H_

+#ifndef VPX_VP9_VP9_IFACE_COMMON_H_

+#define VPX_VP9_VP9_IFACE_COMMON_H_

 #include "vpx_ports/mem.h"

@@ -142,4 +142,4 @@

   assert(0 && "Invalid Reference Frame");

   return VP9_LAST_FLAG;

 }

-#endif  // VP9_VP9_IFACE_COMMON_H_

+#endif  // VPX_VP9_VP9_IFACE_COMMON_H_

--- a/vpx/internal/vpx_codec_internal.h

+++ b/vpx/internal/vpx_codec_internal.h

@@ -40,8 +40,8 @@

  * Once initialized, the instance is manged using other functions from

  * the vpx_codec_* family.

  */

-#ifndef VPX_INTERNAL_VPX_CODEC_INTERNAL_H_

-#define VPX_INTERNAL_VPX_CODEC_INTERNAL_H_

+#ifndef VPX_VPX_INTERNAL_VPX_CODEC_INTERNAL_H_

+#define VPX_VPX_INTERNAL_VPX_CODEC_INTERNAL_H_

 #include "../vpx_decoder.h"

 #include "../vpx_encoder.h"

 #include <stdarg.h>

@@ -442,4 +442,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_INTERNAL_VPX_CODEC_INTERNAL_H_

+#endif  // VPX_VPX_INTERNAL_VPX_CODEC_INTERNAL_H_

--- a/vpx/vp8.h

+++ b/vpx/vp8.h

@@ -27,8 +27,8 @@

 /*!\file

  * \brief Provides controls common to both the VP8 encoder and decoder.

  */

-#ifndef VPX_VP8_H_

-#define VPX_VP8_H_

+#ifndef VPX_VPX_VP8_H_

+#define VPX_VPX_VP8_H_

 #include "./vpx_codec.h"

 #include "./vpx_image.h"

@@ -150,4 +150,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_VP8_H_

+#endif  // VPX_VPX_VP8_H_

--- a/vpx/vp8cx.h

+++ b/vpx/vp8cx.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_VP8CX_H_

-#define VPX_VP8CX_H_

+#ifndef VPX_VPX_VP8CX_H_

+#define VPX_VPX_VP8CX_H_

 /*!\defgroup vp8_encoder WebM VP8/VP9 Encoder

  * \ingroup vp8

@@ -1008,4 +1008,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_VP8CX_H_

+#endif  // VPX_VPX_VP8CX_H_

--- a/vpx/vp8dx.h

+++ b/vpx/vp8dx.h

@@ -17,8 +17,8 @@

  * \brief Provides definitions for using VP8 or VP9 within the vpx Decoder

  *        interface.

  */

-#ifndef VPX_VP8DX_H_

-#define VPX_VP8DX_H_

+#ifndef VPX_VPX_VP8DX_H_

+#define VPX_VPX_VP8DX_H_

 #ifdef __cplusplus

 extern "C" {

@@ -199,4 +199,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_VP8DX_H_

+#endif  // VPX_VPX_VP8DX_H_

--- a/vpx/vpx_codec.h

+++ b/vpx/vpx_codec.h

@@ -35,8 +35,8 @@

  * Once initialized, the instance is manged using other functions from

  * the vpx_codec_* family.

  */

-#ifndef VPX_VPX_CODEC_H_

-#define VPX_VPX_CODEC_H_

+#ifndef VPX_VPX_VPX_CODEC_H_

+#define VPX_VPX_VPX_CODEC_H_

 #ifdef __cplusplus

 extern "C" {

@@ -465,4 +465,4 @@

 #ifdef __cplusplus

 }

 #endif

-#endif  // VPX_VPX_CODEC_H_

+#endif  // VPX_VPX_VPX_CODEC_H_

--- a/vpx/vpx_decoder.h

+++ b/vpx/vpx_decoder.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_VPX_DECODER_H_

-#define VPX_VPX_DECODER_H_

+#ifndef VPX_VPX_VPX_DECODER_H_

+#define VPX_VPX_VPX_DECODER_H_

 /*!\defgroup decoder Decoder Algorithm Interface

  * \ingroup codec

@@ -362,4 +362,4 @@

 #ifdef __cplusplus

 }

 #endif

-#endif  // VPX_VPX_DECODER_H_

+#endif  // VPX_VPX_VPX_DECODER_H_

--- a/vpx/vpx_encoder.h

+++ b/vpx/vpx_encoder.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_VPX_ENCODER_H_

-#define VPX_VPX_ENCODER_H_

+#ifndef VPX_VPX_VPX_ENCODER_H_

+#define VPX_VPX_VPX_ENCODER_H_

 /*!\defgroup encoder Encoder Algorithm Interface

  * \ingroup codec

@@ -981,4 +981,4 @@

 #ifdef __cplusplus

 }

 #endif

-#endif  // VPX_VPX_ENCODER_H_

+#endif  // VPX_VPX_VPX_ENCODER_H_

--- a/vpx/vpx_frame_buffer.h

+++ b/vpx/vpx_frame_buffer.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_VPX_FRAME_BUFFER_H_

-#define VPX_VPX_FRAME_BUFFER_H_

+#ifndef VPX_VPX_VPX_FRAME_BUFFER_H_

+#define VPX_VPX_VPX_FRAME_BUFFER_H_

 /*!\file

  * \brief Describes the decoder external frame buffer interface.

@@ -80,4 +80,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_VPX_FRAME_BUFFER_H_

+#endif  // VPX_VPX_VPX_FRAME_BUFFER_H_

--- a/vpx/vpx_image.h

+++ b/vpx/vpx_image.h

@@ -12,8 +12,8 @@

  * \brief Describes the vpx image descriptor and associated operations

  *

  */

-#ifndef VPX_VPX_IMAGE_H_

-#define VPX_VPX_IMAGE_H_

+#ifndef VPX_VPX_VPX_IMAGE_H_

+#define VPX_VPX_VPX_IMAGE_H_

 #ifdef __cplusplus

 extern "C" {

@@ -204,4 +204,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_VPX_IMAGE_H_

+#endif  // VPX_VPX_VPX_IMAGE_H_

--- a/vpx/vpx_integer.h

+++ b/vpx/vpx_integer.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_VPX_INTEGER_H_

-#define VPX_VPX_INTEGER_H_

+#ifndef VPX_VPX_VPX_INTEGER_H_

+#define VPX_VPX_VPX_INTEGER_H_

 /* get ptrdiff_t, size_t, wchar_t, NULL */

 #include <stddef.h>

@@ -60,4 +60,4 @@

 #include <inttypes.h>

 #endif

-#endif  // VPX_VPX_INTEGER_H_

+#endif  // VPX_VPX_VPX_INTEGER_H_

--- a/vpx_dsp/arm/highbd_idct_neon.h

+++ b/vpx_dsp/arm/highbd_idct_neon.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_ARM_HIGHBD_IDCT_NEON_H_

-#define VPX_DSP_ARM_HIGHBD_IDCT_NEON_H_

+#ifndef VPX_VPX_DSP_ARM_HIGHBD_IDCT_NEON_H_

+#define VPX_VPX_DSP_ARM_HIGHBD_IDCT_NEON_H_

 #include <arm_neon.h>

@@ -471,4 +471,4 @@

                                          uint16_t *dest, const int stride,

                                          const int bd);

-#endif  // VPX_DSP_ARM_HIGHBD_IDCT_NEON_H_

+#endif  // VPX_VPX_DSP_ARM_HIGHBD_IDCT_NEON_H_

--- a/vpx_dsp/arm/idct_neon.h

+++ b/vpx_dsp/arm/idct_neon.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_ARM_IDCT_NEON_H_

-#define VPX_DSP_ARM_IDCT_NEON_H_

+#ifndef VPX_VPX_DSP_ARM_IDCT_NEON_H_

+#define VPX_VPX_DSP_ARM_IDCT_NEON_H_

 #include <arm_neon.h>

@@ -916,4 +916,4 @@

 void vpx_idct32_8_neon(const int16_t *input, void *const output, int stride,

                        const int highbd_flag);

-#endif  // VPX_DSP_ARM_IDCT_NEON_H_

+#endif  // VPX_VPX_DSP_ARM_IDCT_NEON_H_

--- a/vpx_dsp/arm/mem_neon.h

+++ b/vpx_dsp/arm/mem_neon.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_ARM_MEM_NEON_H_

-#define VPX_DSP_ARM_MEM_NEON_H_

+#ifndef VPX_VPX_DSP_ARM_MEM_NEON_H_

+#define VPX_VPX_DSP_ARM_MEM_NEON_H_

 #include <arm_neon.h>

 #include <assert.h>

@@ -181,4 +181,4 @@

   buf += stride;

   vst1_lane_u32((uint32_t *)buf, a_u32, 1);

 }

-#endif  // VPX_DSP_ARM_MEM_NEON_H_

+#endif  // VPX_VPX_DSP_ARM_MEM_NEON_H_

--- a/vpx_dsp/arm/sum_neon.h

+++ b/vpx_dsp/arm/sum_neon.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_ARM_SUM_NEON_H_

-#define VPX_DSP_ARM_SUM_NEON_H_

+#ifndef VPX_VPX_DSP_ARM_SUM_NEON_H_

+#define VPX_VPX_DSP_ARM_SUM_NEON_H_

 #include <arm_neon.h>

@@ -35,4 +35,4 @@

   return vadd_u32(vreinterpret_u32_u64(vget_low_u64(b)),

                   vreinterpret_u32_u64(vget_high_u64(b)));

 }

-#endif  // VPX_DSP_ARM_SUM_NEON_H_

+#endif  // VPX_VPX_DSP_ARM_SUM_NEON_H_

--- a/vpx_dsp/arm/transpose_neon.h

+++ b/vpx_dsp/arm/transpose_neon.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_ARM_TRANSPOSE_NEON_H_

-#define VPX_DSP_ARM_TRANSPOSE_NEON_H_

+#ifndef VPX_VPX_DSP_ARM_TRANSPOSE_NEON_H_

+#define VPX_VPX_DSP_ARM_TRANSPOSE_NEON_H_

 #include <arm_neon.h>

@@ -1313,4 +1313,4 @@

   transpose_s32_8x8(a0, a1, a2, a3, a4, a5, a6, a7);

 }

-#endif  // VPX_DSP_ARM_TRANSPOSE_NEON_H_

+#endif  // VPX_VPX_DSP_ARM_TRANSPOSE_NEON_H_

--- a/vpx_dsp/arm/vpx_convolve8_neon.h

+++ b/vpx_dsp/arm/vpx_convolve8_neon.h

@@ -8,6 +8,9 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

+#ifndef VPX_VPX_DSP_ARM_VPX_CONVOLVE8_NEON_H_

+#define VPX_VPX_DSP_ARM_VPX_CONVOLVE8_NEON_H_

+

 #include <arm_neon.h>

 #include "./vpx_config.h"

@@ -131,3 +134,5 @@

   return convolve8_8(ss[0], ss[1], ss[2], ss[3], ss[4], ss[5], ss[6], ss[7],

                      filters, filter3, filter4);

 }

+

+#endif  // VPX_VPX_DSP_ARM_VPX_CONVOLVE8_NEON_H_

--- a/vpx_dsp/arm/vpx_convolve8_neon_asm.h

+++ b/vpx_dsp/arm/vpx_convolve8_neon_asm.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_ARM_VPX_CONVOLVE8_NEON_ASM_H_

-#define VPX_DSP_ARM_VPX_CONVOLVE8_NEON_ASM_H_

+#ifndef VPX_VPX_DSP_ARM_VPX_CONVOLVE8_NEON_ASM_H_

+#define VPX_VPX_DSP_ARM_VPX_CONVOLVE8_NEON_ASM_H_

 #define DECLARE_FILTER(dir, type)                                  \

   void vpx_convolve8_##dir##_filter_##type##_neon(                 \

@@ -26,4 +26,4 @@

 DECLARE_FILTER(vert, type2);

 DECLARE_FILTER(avg_vert, type2);

-#endif /* VPX_DSP_ARM_VPX_CONVOLVE8_NEON_ASM_H_ */

+#endif  // VPX_VPX_DSP_ARM_VPX_CONVOLVE8_NEON_ASM_H_

--- a/vpx_dsp/bitreader.h

+++ b/vpx_dsp/bitreader.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_BITREADER_H_

-#define VPX_DSP_BITREADER_H_

+#ifndef VPX_VPX_DSP_BITREADER_H_

+#define VPX_VPX_DSP_BITREADER_H_

 #include <stddef.h>

 #include <limits.h>

@@ -131,4 +131,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_DSP_BITREADER_H_

+#endif  // VPX_VPX_DSP_BITREADER_H_

--- a/vpx_dsp/bitreader_buffer.h

+++ b/vpx_dsp/bitreader_buffer.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_BITREADER_BUFFER_H_

-#define VPX_DSP_BITREADER_BUFFER_H_

+#ifndef VPX_VPX_DSP_BITREADER_BUFFER_H_

+#define VPX_VPX_DSP_BITREADER_BUFFER_H_

 #include <limits.h>

@@ -44,4 +44,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_DSP_BITREADER_BUFFER_H_

+#endif  // VPX_VPX_DSP_BITREADER_BUFFER_H_

--- a/vpx_dsp/bitwriter.h

+++ b/vpx_dsp/bitwriter.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_BITWRITER_H_

-#define VPX_DSP_BITWRITER_H_

+#ifndef VPX_VPX_DSP_BITWRITER_H_

+#define VPX_VPX_DSP_BITWRITER_H_

 #include "vpx_ports/mem.h"

@@ -94,4 +94,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_DSP_BITWRITER_H_

+#endif  // VPX_VPX_DSP_BITWRITER_H_

--- a/vpx_dsp/bitwriter_buffer.h

+++ b/vpx_dsp/bitwriter_buffer.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_BITWRITER_BUFFER_H_

-#define VPX_DSP_BITWRITER_BUFFER_H_

+#ifndef VPX_VPX_DSP_BITWRITER_BUFFER_H_

+#define VPX_VPX_DSP_BITWRITER_BUFFER_H_

 #include "vpx/vpx_integer.h"

@@ -35,4 +35,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_DSP_BITWRITER_BUFFER_H_

+#endif  // VPX_VPX_DSP_BITWRITER_BUFFER_H_

--- a/vpx_dsp/fwd_txfm.h

+++ b/vpx_dsp/fwd_txfm.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_FWD_TXFM_H_

-#define VPX_DSP_FWD_TXFM_H_

+#ifndef VPX_VPX_DSP_FWD_TXFM_H_

+#define VPX_VPX_DSP_FWD_TXFM_H_

 #include "vpx_dsp/txfm_common.h"

@@ -22,4 +22,4 @@

 }

 void vpx_fdct32(const tran_high_t *input, tran_high_t *output, int round);

-#endif  // VPX_DSP_FWD_TXFM_H_

+#endif  // VPX_VPX_DSP_FWD_TXFM_H_

--- a/vpx_dsp/inv_txfm.h

+++ b/vpx_dsp/inv_txfm.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_INV_TXFM_H_

-#define VPX_DSP_INV_TXFM_H_

+#ifndef VPX_VPX_DSP_INV_TXFM_H_

+#define VPX_VPX_DSP_INV_TXFM_H_

 #include <assert.h>

@@ -122,4 +122,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_DSP_INV_TXFM_H_

+#endif  // VPX_VPX_DSP_INV_TXFM_H_

--- a/vpx_dsp/mips/common_dspr2.h

+++ b/vpx_dsp/mips/common_dspr2.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_COMMON_MIPS_DSPR2_H_

-#define VPX_COMMON_MIPS_DSPR2_H_

+#ifndef VPX_VPX_DSP_MIPS_COMMON_DSPR2_H_

+#define VPX_VPX_DSP_MIPS_COMMON_DSPR2_H_

 #include <assert.h>

 #include "./vpx_config.h"

@@ -45,4 +45,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_COMMON_MIPS_DSPR2_H_

+#endif  // VPX_VPX_DSP_MIPS_COMMON_DSPR2_H_

--- a/vpx_dsp/mips/convolve_common_dspr2.h

+++ b/vpx_dsp/mips/convolve_common_dspr2.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_MIPS_VPX_COMMON_DSPR2_H_

-#define VPX_DSP_MIPS_VPX_COMMON_DSPR2_H_

+#ifndef VPX_VPX_DSP_MIPS_CONVOLVE_COMMON_DSPR2_H_

+#define VPX_VPX_DSP_MIPS_CONVOLVE_COMMON_DSPR2_H_

 #include <assert.h>

@@ -55,4 +55,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_DSP_MIPS_VPX_COMMON_DSPR2_H_

+#endif  // VPX_VPX_DSP_MIPS_CONVOLVE_COMMON_DSPR2_H_

--- a/vpx_dsp/mips/fwd_txfm_msa.h

+++ b/vpx_dsp/mips/fwd_txfm_msa.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_MIPS_FWD_TXFM_MSA_H_

-#define VPX_DSP_MIPS_FWD_TXFM_MSA_H_

+#ifndef VPX_VPX_DSP_MIPS_FWD_TXFM_MSA_H_

+#define VPX_VPX_DSP_MIPS_FWD_TXFM_MSA_H_

 #include "vpx_dsp/mips/txfm_macros_msa.h"

 #include "vpx_dsp/txfm_common.h"

@@ -361,4 +361,4 @@

 void fdct8x16_1d_column(const int16_t *input, int16_t *tmp_ptr,

                         int32_t src_stride);

 void fdct16x8_1d_row(int16_t *input, int16_t *output);

-#endif  // VPX_DSP_MIPS_FWD_TXFM_MSA_H_

+#endif  // VPX_VPX_DSP_MIPS_FWD_TXFM_MSA_H_

--- a/vpx_dsp/mips/inv_txfm_dspr2.h

+++ b/vpx_dsp/mips/inv_txfm_dspr2.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_MIPS_INV_TXFM_DSPR2_H_

-#define VPX_DSP_MIPS_INV_TXFM_DSPR2_H_

+#ifndef VPX_VPX_DSP_MIPS_INV_TXFM_DSPR2_H_

+#define VPX_VPX_DSP_MIPS_INV_TXFM_DSPR2_H_

 #include <assert.h>

@@ -73,4 +73,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_DSP_MIPS_INV_TXFM_DSPR2_H_

+#endif  // VPX_VPX_DSP_MIPS_INV_TXFM_DSPR2_H_

--- a/vpx_dsp/mips/inv_txfm_msa.h

+++ b/vpx_dsp/mips/inv_txfm_msa.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_MIPS_INV_TXFM_MSA_H_

-#define VPX_DSP_MIPS_INV_TXFM_MSA_H_

+#ifndef VPX_VPX_DSP_MIPS_INV_TXFM_MSA_H_

+#define VPX_VPX_DSP_MIPS_INV_TXFM_MSA_H_

 #include "vpx_dsp/mips/macros_msa.h"

 #include "vpx_dsp/mips/txfm_macros_msa.h"

@@ -408,4 +408,4 @@

 void vpx_iadst16_1d_columns_addblk_msa(int16_t *input, uint8_t *dst,

                                        int32_t dst_stride);

 void vpx_iadst16_1d_rows_msa(const int16_t *input, int16_t *output);

-#endif  // VPX_DSP_MIPS_INV_TXFM_MSA_H_

+#endif  // VPX_VPX_DSP_MIPS_INV_TXFM_MSA_H_

--- a/vpx_dsp/mips/loopfilter_filters_dspr2.h

+++ b/vpx_dsp/mips/loopfilter_filters_dspr2.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_MIPS_DSPR2_VP9_LOOPFILTER_FILTERS_DSPR2_H_

-#define VP9_COMMON_MIPS_DSPR2_VP9_LOOPFILTER_FILTERS_DSPR2_H_

+#ifndef VPX_VPX_DSP_MIPS_LOOPFILTER_FILTERS_DSPR2_H_

+#define VPX_VPX_DSP_MIPS_LOOPFILTER_FILTERS_DSPR2_H_

 #include <stdlib.h>

@@ -731,4 +731,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_MIPS_DSPR2_VP9_LOOPFILTER_FILTERS_DSPR2_H_

+#endif  // VPX_VPX_DSP_MIPS_LOOPFILTER_FILTERS_DSPR2_H_

--- a/vpx_dsp/mips/loopfilter_macros_dspr2.h

+++ b/vpx_dsp/mips/loopfilter_macros_dspr2.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_MIPS_DSPR2_VP9_LOOPFILTER_MACROS_DSPR2_H_

-#define VP9_COMMON_MIPS_DSPR2_VP9_LOOPFILTER_MACROS_DSPR2_H_

+#ifndef VPX_VPX_DSP_MIPS_LOOPFILTER_MACROS_DSPR2_H_

+#define VPX_VPX_DSP_MIPS_LOOPFILTER_MACROS_DSPR2_H_

 #include <stdlib.h>

@@ -432,4 +432,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_MIPS_DSPR2_VP9_LOOPFILTER_MACROS_DSPR2_H_

+#endif  // VPX_VPX_DSP_MIPS_LOOPFILTER_MACROS_DSPR2_H_

--- a/vpx_dsp/mips/loopfilter_masks_dspr2.h

+++ b/vpx_dsp/mips/loopfilter_masks_dspr2.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VP9_COMMON_MIPS_DSPR2_VP9_LOOPFILTER_MASKS_DSPR2_H_

-#define VP9_COMMON_MIPS_DSPR2_VP9_LOOPFILTER_MASKS_DSPR2_H_

+#ifndef VPX_VPX_DSP_MIPS_LOOPFILTER_MASKS_DSPR2_H_

+#define VPX_VPX_DSP_MIPS_LOOPFILTER_MASKS_DSPR2_H_

 #include <stdlib.h>

@@ -352,4 +352,4 @@

 }  // extern "C"

 #endif

-#endif  // VP9_COMMON_MIPS_DSPR2_VP9_LOOPFILTER_MASKS_DSPR2_H_

+#endif  // VPX_VPX_DSP_MIPS_LOOPFILTER_MASKS_DSPR2_H_

--- a/vpx_dsp/mips/loopfilter_msa.h

+++ b/vpx_dsp/mips/loopfilter_msa.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_LOOPFILTER_MSA_H_

-#define VPX_DSP_LOOPFILTER_MSA_H_

+#ifndef VPX_VPX_DSP_MIPS_LOOPFILTER_MSA_H_

+#define VPX_VPX_DSP_MIPS_LOOPFILTER_MSA_H_

 #include "vpx_dsp/mips/macros_msa.h"

@@ -174,4 +174,4 @@

     mask_out = limit_in < (v16u8)mask_out;                                   \

     mask_out = __msa_xori_b(mask_out, 0xff);                                 \

   }

-#endif /* VPX_DSP_LOOPFILTER_MSA_H_ */

+#endif  // VPX_VPX_DSP_MIPS_LOOPFILTER_MSA_H_

--- a/vpx_dsp/mips/macros_msa.h

+++ b/vpx_dsp/mips/macros_msa.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_MIPS_MACROS_MSA_H_

-#define VPX_DSP_MIPS_MACROS_MSA_H_

+#ifndef VPX_VPX_DSP_MIPS_MACROS_MSA_H_

+#define VPX_VPX_DSP_MIPS_MACROS_MSA_H_

 #include <msa.h>

@@ -1966,4 +1966,4 @@

                                                                 \

     tmp1_m;                                                     \

   })

-#endif /* VPX_DSP_MIPS_MACROS_MSA_H_ */

+#endif  // VPX_VPX_DSP_MIPS_MACROS_MSA_H_

--- a/vpx_dsp/mips/txfm_macros_msa.h

+++ b/vpx_dsp/mips/txfm_macros_msa.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_MIPS_TXFM_MACROS_MIPS_MSA_H_

-#define VPX_DSP_MIPS_TXFM_MACROS_MIPS_MSA_H_

+#ifndef VPX_VPX_DSP_MIPS_TXFM_MACROS_MSA_H_

+#define VPX_VPX_DSP_MIPS_TXFM_MACROS_MSA_H_

 #include "vpx_dsp/mips/macros_msa.h"

@@ -98,4 +98,4 @@

     SRARI_W4_SW(m4_m, m5_m, tmp2_m, tmp3_m, DCT_CONST_BITS);                  \

     PCKEV_H2_SH(m5_m, m4_m, tmp3_m, tmp2_m, out2, out3);                      \

   }

-#endif  // VPX_DSP_MIPS_TXFM_MACROS_MIPS_MSA_H_

+#endif  // VPX_VPX_DSP_MIPS_TXFM_MACROS_MSA_H_

--- a/vpx_dsp/mips/vpx_convolve_msa.h

+++ b/vpx_dsp/mips/vpx_convolve_msa.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_MIPS_VPX_CONVOLVE_MSA_H_

-#define VPX_DSP_MIPS_VPX_CONVOLVE_MSA_H_

+#ifndef VPX_VPX_DSP_MIPS_VPX_CONVOLVE_MSA_H_

+#define VPX_VPX_DSP_MIPS_VPX_CONVOLVE_MSA_H_

 #include "vpx_dsp/mips/macros_msa.h"

 #include "vpx_dsp/vpx_filter.h"

@@ -119,4 +119,4 @@

     AVER_UB2_UB(tmp0_m, dst0, tmp1_m, dst1, tmp0_m, tmp1_m);             \

     ST8x4_UB(tmp0_m, tmp1_m, pdst_m, stride);                            \

   }

-#endif /* VPX_DSP_MIPS_VPX_CONVOLVE_MSA_H_ */

+#endif  // VPX_VPX_DSP_MIPS_VPX_CONVOLVE_MSA_H_

--- a/vpx_dsp/postproc.h

+++ b/vpx_dsp/postproc.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_POSTPROC_H_

-#define VPX_DSP_POSTPROC_H_

+#ifndef VPX_VPX_DSP_POSTPROC_H_

+#define VPX_VPX_DSP_POSTPROC_H_

 #ifdef __cplusplus

 extern "C" {

@@ -22,4 +22,4 @@

 }

 #endif

-#endif  // VPX_DSP_POSTPROC_H_

+#endif  // VPX_VPX_DSP_POSTPROC_H_

--- a/vpx_dsp/ppc/bitdepth_conversion_vsx.h

+++ b/vpx_dsp/ppc/bitdepth_conversion_vsx.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_PPC_BITDEPTH_CONVERSION_VSX_H_

-#define VPX_DSP_PPC_BITDEPTH_CONVERSION_VSX_H_

+#ifndef VPX_VPX_DSP_PPC_BITDEPTH_CONVERSION_VSX_H_

+#define VPX_VPX_DSP_PPC_BITDEPTH_CONVERSION_VSX_H_

 #include "./vpx_config.h"

 #include "vpx/vpx_integer.h"

@@ -44,4 +44,4 @@

 #endif

 }

-#endif  // VPX_DSP_PPC_BITDEPTH_CONVERSION_VSX_H_

+#endif  // VPX_VPX_DSP_PPC_BITDEPTH_CONVERSION_VSX_H_

--- a/vpx_dsp/ppc/inv_txfm_vsx.h

+++ b/vpx_dsp/ppc/inv_txfm_vsx.h

@@ -1,3 +1,16 @@

+/*

+ *  Copyright (c) 2018 The WebM project authors. All Rights Reserved.

+ *

+ *  Use of this source code is governed by a BSD-style license

+ *  that can be found in the LICENSE file in the root of the source

+ *  tree. An additional intellectual property rights grant can be found

+ *  in the file PATENTS.  All contributing project authors may

+ *  be found in the AUTHORS file in the root of the source tree.

+ */

+

+#ifndef VPX_VPX_DSP_PPC_INV_TXFM_VSX_H_

+#define VPX_VPX_DSP_PPC_INV_TXFM_VSX_H_

+

 #include "vpx_dsp/ppc/types_vsx.h"

 void vpx_round_store4x4_vsx(int16x8_t *in, int16x8_t *out, uint8_t *dest,

@@ -31,3 +44,5 @@

                               int stride);

 void vpx_idct16_vsx(int16x8_t *src0, int16x8_t *src1);

 void vpx_iadst16_vsx(int16x8_t *src0, int16x8_t *src1);

+

+#endif  // VPX_VPX_DSP_PPC_INV_TXFM_VSX_H_

--- a/vpx_dsp/ppc/transpose_vsx.h

+++ b/vpx_dsp/ppc/transpose_vsx.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_PPC_TRANSPOSE_VSX_H_

-#define VPX_DSP_PPC_TRANSPOSE_VSX_H_

+#ifndef VPX_VPX_DSP_PPC_TRANSPOSE_VSX_H_

+#define VPX_VPX_DSP_PPC_TRANSPOSE_VSX_H_

 #include "./vpx_config.h"

 #include "vpx_dsp/ppc/types_vsx.h"

@@ -130,4 +130,4 @@

   b[7] = vec_mergel(s2_3, s2_7);

 }

-#endif  // VPX_DSP_PPC_TRANSPOSE_VSX_H_

+#endif  // VPX_VPX_DSP_PPC_TRANSPOSE_VSX_H_

--- a/vpx_dsp/ppc/txfm_common_vsx.h

+++ b/vpx_dsp/ppc/txfm_common_vsx.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_PPC_TXFM_COMMON_VSX_H_

-#define VPX_DSP_PPC_TXFM_COMMON_VSX_H_

+#ifndef VPX_VPX_DSP_PPC_TXFM_COMMON_VSX_H_

+#define VPX_VPX_DSP_PPC_TXFM_COMMON_VSX_H_

 #include "vpx_dsp/ppc/types_vsx.h"

@@ -87,4 +87,4 @@

                                      1606, 1606, 1606, 1606 };

 static const int16x8_t cospi31_v = { 804, 804, 804, 804, 804, 804, 804, 804 };

-#endif  // VPX_DSP_PPC_TXFM_COMMON_VSX_H_

+#endif  // VPX_VPX_DSP_PPC_TXFM_COMMON_VSX_H_

--- a/vpx_dsp/ppc/types_vsx.h

+++ b/vpx_dsp/ppc/types_vsx.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_PPC_TYPES_VSX_H_

-#define VPX_DSP_PPC_TYPES_VSX_H_

+#ifndef VPX_VPX_DSP_PPC_TYPES_VSX_H_

+#define VPX_VPX_DSP_PPC_TYPES_VSX_H_

 #include <altivec.h>

@@ -105,4 +105,4 @@

                                                    0x08, 0x09, 0x18, 0x19,

                                                    0x0C, 0x0D, 0x1C, 0x1D };

-#endif  // VPX_DSP_PPC_TYPES_VSX_H_

+#endif  // VPX_VPX_DSP_PPC_TYPES_VSX_H_

--- a/vpx_dsp/prob.h

+++ b/vpx_dsp/prob.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_PROB_H_

-#define VPX_DSP_PROB_H_

+#ifndef VPX_VPX_DSP_PROB_H_

+#define VPX_VPX_DSP_PROB_H_

 #include <assert.h>

@@ -103,4 +103,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_DSP_PROB_H_

+#endif  // VPX_VPX_DSP_PROB_H_

--- a/vpx_dsp/psnr.h

+++ b/vpx_dsp/psnr.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_PSNR_H_

-#define VPX_DSP_PSNR_H_

+#ifndef VPX_VPX_DSP_PSNR_H_

+#define VPX_VPX_DSP_PSNR_H_

 #include "vpx_scale/yv12config.h"

@@ -54,4 +54,4 @@

 #ifdef __cplusplus

 }  // extern "C"

 #endif

-#endif  // VPX_DSP_PSNR_H_

+#endif  // VPX_VPX_DSP_PSNR_H_

--- a/vpx_dsp/quantize.h

+++ b/vpx_dsp/quantize.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_QUANTIZE_H_

-#define VPX_DSP_QUANTIZE_H_

+#ifndef VPX_VPX_DSP_QUANTIZE_H_

+#define VPX_VPX_DSP_QUANTIZE_H_

 #include "./vpx_config.h"

 #include "vpx_dsp/vpx_dsp_common.h"

@@ -45,4 +45,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_DSP_QUANTIZE_H_

+#endif  // VPX_VPX_DSP_QUANTIZE_H_

--- a/vpx_dsp/skin_detection.h

+++ b/vpx_dsp/skin_detection.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_SKIN_DETECTION_H_

-#define VPX_DSP_SKIN_DETECTION_H_

+#ifndef VPX_VPX_DSP_SKIN_DETECTION_H_

+#define VPX_VPX_DSP_SKIN_DETECTION_H_

 #ifdef __cplusplus

 extern "C" {

@@ -21,4 +21,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_DSP_SKIN_DETECTION_H_

+#endif  // VPX_VPX_DSP_SKIN_DETECTION_H_

--- a/vpx_dsp/ssim.h

+++ b/vpx_dsp/ssim.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_SSIM_H_

-#define VPX_DSP_SSIM_H_

+#ifndef VPX_VPX_DSP_SSIM_H_

+#define VPX_VPX_DSP_SSIM_H_

 #define MAX_SSIM_DB 100.0;

@@ -84,4 +84,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_DSP_SSIM_H_

+#endif  // VPX_VPX_DSP_SSIM_H_

--- a/vpx_dsp/txfm_common.h

+++ b/vpx_dsp/txfm_common.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_TXFM_COMMON_H_

-#define VPX_DSP_TXFM_COMMON_H_

+#ifndef VPX_VPX_DSP_TXFM_COMMON_H_

+#define VPX_VPX_DSP_TXFM_COMMON_H_

 #include "vpx_dsp/vpx_dsp_common.h"

@@ -63,4 +63,4 @@

 static const tran_coef_t sinpi_3_9 = 13377;

 static const tran_coef_t sinpi_4_9 = 15212;

-#endif  // VPX_DSP_TXFM_COMMON_H_

+#endif  // VPX_VPX_DSP_TXFM_COMMON_H_

--- a/vpx_dsp/variance.h

+++ b/vpx_dsp/variance.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_VARIANCE_H_

-#define VPX_DSP_VARIANCE_H_

+#ifndef VPX_VPX_DSP_VARIANCE_H_

+#define VPX_VPX_DSP_VARIANCE_H_

 #include "./vpx_config.h"

@@ -82,4 +82,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_DSP_VARIANCE_H_

+#endif  // VPX_VPX_DSP_VARIANCE_H_

--- a/vpx_dsp/vpx_convolve.h

+++ b/vpx_dsp/vpx_convolve.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_VPX_CONVOLVE_H_

-#define VPX_DSP_VPX_CONVOLVE_H_

+#ifndef VPX_VPX_DSP_VPX_CONVOLVE_H_

+#define VPX_VPX_DSP_VPX_CONVOLVE_H_

 #include "./vpx_config.h"

 #include "vpx/vpx_integer.h"

@@ -35,4 +35,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_DSP_VPX_CONVOLVE_H_

+#endif  // VPX_VPX_DSP_VPX_CONVOLVE_H_

--- a/vpx_dsp/vpx_dsp_common.h

+++ b/vpx_dsp/vpx_dsp_common.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_VPX_DSP_COMMON_H_

-#define VPX_DSP_VPX_DSP_COMMON_H_

+#ifndef VPX_VPX_DSP_VPX_DSP_COMMON_H_

+#define VPX_VPX_DSP_VPX_DSP_COMMON_H_

 #include "./vpx_config.h"

 #include "vpx/vpx_integer.h"

@@ -70,4 +70,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_DSP_VPX_DSP_COMMON_H_

+#endif  // VPX_VPX_DSP_VPX_DSP_COMMON_H_

--- a/vpx_dsp/vpx_filter.h

+++ b/vpx_dsp/vpx_filter.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_VPX_FILTER_H_

-#define VPX_DSP_VPX_FILTER_H_

+#ifndef VPX_VPX_DSP_VPX_FILTER_H_

+#define VPX_VPX_DSP_VPX_FILTER_H_

 #include "vpx/vpx_integer.h"

@@ -30,4 +30,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_DSP_VPX_FILTER_H_

+#endif  // VPX_VPX_DSP_VPX_FILTER_H_

--- a/vpx_dsp/x86/bitdepth_conversion_avx2.h

+++ b/vpx_dsp/x86/bitdepth_conversion_avx2.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_X86_BITDEPTH_CONVERSION_AVX2_H_

-#define VPX_DSP_X86_BITDEPTH_CONVERSION_AVX2_H_

+#ifndef VPX_VPX_DSP_X86_BITDEPTH_CONVERSION_AVX2_H_

+#define VPX_VPX_DSP_X86_BITDEPTH_CONVERSION_AVX2_H_

 #include <immintrin.h>

@@ -41,4 +41,4 @@

   _mm256_storeu_si256((__m256i *)b, a);

 #endif

 }

-#endif  // VPX_DSP_X86_BITDEPTH_CONVERSION_AVX2_H_

+#endif  // VPX_VPX_DSP_X86_BITDEPTH_CONVERSION_AVX2_H_

--- a/vpx_dsp/x86/bitdepth_conversion_sse2.h

+++ b/vpx_dsp/x86/bitdepth_conversion_sse2.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_X86_BITDEPTH_CONVERSION_SSE2_H_

-#define VPX_DSP_X86_BITDEPTH_CONVERSION_SSE2_H_

+#ifndef VPX_VPX_DSP_X86_BITDEPTH_CONVERSION_SSE2_H_

+#define VPX_VPX_DSP_X86_BITDEPTH_CONVERSION_SSE2_H_

 #include <xmmintrin.h>

@@ -53,4 +53,4 @@

   _mm_store_si128((__m128i *)(a), zero);

 #endif

 }

-#endif  // VPX_DSP_X86_BITDEPTH_CONVERSION_SSE2_H_

+#endif  // VPX_VPX_DSP_X86_BITDEPTH_CONVERSION_SSE2_H_

--- a/vpx_dsp/x86/convolve.h

+++ b/vpx_dsp/x86/convolve.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_X86_CONVOLVE_H_

-#define VPX_DSP_X86_CONVOLVE_H_

+#ifndef VPX_VPX_DSP_X86_CONVOLVE_H_

+#define VPX_VPX_DSP_X86_CONVOLVE_H_

 #include <assert.h>

@@ -200,4 +200,4 @@

   }

 #endif  // CONFIG_VP9_HIGHBITDEPTH

-#endif  // VPX_DSP_X86_CONVOLVE_H_

+#endif  // VPX_VPX_DSP_X86_CONVOLVE_H_

--- a/vpx_dsp/x86/convolve_avx2.h

+++ b/vpx_dsp/x86/convolve_avx2.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_X86_CONVOLVE_AVX2_H_

-#define VPX_DSP_X86_CONVOLVE_AVX2_H_

+#ifndef VPX_VPX_DSP_X86_CONVOLVE_AVX2_H_

+#define VPX_VPX_DSP_X86_CONVOLVE_AVX2_H_

 #include <immintrin.h>  // AVX2

@@ -102,4 +102,4 @@

 #undef MM256_BROADCASTSI128_SI256

-#endif  // VPX_DSP_X86_CONVOLVE_AVX2_H_

+#endif  // VPX_VPX_DSP_X86_CONVOLVE_AVX2_H_

--- a/vpx_dsp/x86/convolve_ssse3.h

+++ b/vpx_dsp/x86/convolve_ssse3.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_X86_CONVOLVE_SSSE3_H_

-#define VPX_DSP_X86_CONVOLVE_SSSE3_H_

+#ifndef VPX_VPX_DSP_X86_CONVOLVE_SSSE3_H_

+#define VPX_VPX_DSP_X86_CONVOLVE_SSSE3_H_

 #include <assert.h>

 #include <tmmintrin.h>  // SSSE3

@@ -109,4 +109,4 @@

   return temp;

 }

-#endif  // VPX_DSP_X86_CONVOLVE_SSSE3_H_

+#endif  // VPX_VPX_DSP_X86_CONVOLVE_SSSE3_H_

--- a/vpx_dsp/x86/fwd_txfm_sse2.h

+++ b/vpx_dsp/x86/fwd_txfm_sse2.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_X86_FWD_TXFM_SSE2_H_

-#define VPX_DSP_X86_FWD_TXFM_SSE2_H_

+#ifndef VPX_VPX_DSP_X86_FWD_TXFM_SSE2_H_

+#define VPX_VPX_DSP_X86_FWD_TXFM_SSE2_H_

 #ifdef __cplusplus

 extern "C" {

@@ -368,4 +368,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_DSP_X86_FWD_TXFM_SSE2_H_

+#endif  // VPX_VPX_DSP_X86_FWD_TXFM_SSE2_H_

--- a/vpx_dsp/x86/highbd_inv_txfm_sse2.h

+++ b/vpx_dsp/x86/highbd_inv_txfm_sse2.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_X86_HIGHBD_INV_TXFM_SSE2_H_

-#define VPX_DSP_X86_HIGHBD_INV_TXFM_SSE2_H_

+#ifndef VPX_VPX_DSP_X86_HIGHBD_INV_TXFM_SSE2_H_

+#define VPX_VPX_DSP_X86_HIGHBD_INV_TXFM_SSE2_H_

 #include <emmintrin.h>  // SSE2

@@ -401,4 +401,4 @@

   recon_and_store_4(out, dest, bd);

 }

-#endif  // VPX_DSP_X86_HIGHBD_INV_TXFM_SSE2_H_

+#endif  // VPX_VPX_DSP_X86_HIGHBD_INV_TXFM_SSE2_H_

--- a/vpx_dsp/x86/highbd_inv_txfm_sse4.h

+++ b/vpx_dsp/x86/highbd_inv_txfm_sse4.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_X86_HIGHBD_INV_TXFM_SSE4_H_

-#define VPX_DSP_X86_HIGHBD_INV_TXFM_SSE4_H_

+#ifndef VPX_VPX_DSP_X86_HIGHBD_INV_TXFM_SSE4_H_

+#define VPX_VPX_DSP_X86_HIGHBD_INV_TXFM_SSE4_H_

 #include <smmintrin.h>  // SSE4.1

@@ -109,4 +109,4 @@

 void vpx_highbd_idct8x8_half1d_sse4_1(__m128i *const io);

 void vpx_highbd_idct16_4col_sse4_1(__m128i *const io /*io[16]*/);

-#endif  // VPX_DSP_X86_HIGHBD_INV_TXFM_SSE4_H_

+#endif  // VPX_VPX_DSP_X86_HIGHBD_INV_TXFM_SSE4_H_

--- a/vpx_dsp/x86/inv_txfm_sse2.h

+++ b/vpx_dsp/x86/inv_txfm_sse2.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_X86_INV_TXFM_SSE2_H_

-#define VPX_DSP_X86_INV_TXFM_SSE2_H_

+#ifndef VPX_VPX_DSP_X86_INV_TXFM_SSE2_H_

+#define VPX_VPX_DSP_X86_INV_TXFM_SSE2_H_

 #include <emmintrin.h>  // SSE2

@@ -707,4 +707,4 @@

 void idct32_34_8x32_sse2(const __m128i *const in, __m128i *const out);

 void idct32_34_8x32_ssse3(const __m128i *const in, __m128i *const out);

-#endif  // VPX_DSP_X86_INV_TXFM_SSE2_H_

+#endif  // VPX_VPX_DSP_X86_INV_TXFM_SSE2_H_

--- a/vpx_dsp/x86/inv_txfm_ssse3.h

+++ b/vpx_dsp/x86/inv_txfm_ssse3.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_X86_INV_TXFM_SSSE3_H_

-#define VPX_DSP_X86_INV_TXFM_SSSE3_H_

+#ifndef VPX_VPX_DSP_X86_INV_TXFM_SSSE3_H_

+#define VPX_VPX_DSP_X86_INV_TXFM_SSSE3_H_

 #include <tmmintrin.h>

@@ -107,4 +107,4 @@

 void idct32_135_8x32_ssse3(const __m128i *const in, __m128i *const out);

-#endif  // VPX_DSP_X86_INV_TXFM_SSSE3_H_

+#endif  // VPX_VPX_DSP_X86_INV_TXFM_SSSE3_H_

--- a/vpx_dsp/x86/mem_sse2.h

+++ b/vpx_dsp/x86/mem_sse2.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_X86_MEM_SSE2_H_

-#define VPX_DSP_X86_MEM_SSE2_H_

+#ifndef VPX_VPX_DSP_X86_MEM_SSE2_H_

+#define VPX_VPX_DSP_X86_MEM_SSE2_H_

 #include <emmintrin.h>  // SSE2

@@ -126,4 +126,4 @@

   _mm_storeu_si128((__m128i *)(d + 3 * stride), s[3]);

 }

-#endif  // VPX_DSP_X86_MEM_SSE2_H_

+#endif  // VPX_VPX_DSP_X86_MEM_SSE2_H_

--- a/vpx_dsp/x86/quantize_x86.h

+++ b/vpx_dsp/x86/quantize_x86.h

@@ -8,6 +8,9 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

+#ifndef VPX_VPX_DSP_X86_QUANTIZE_X86_H_

+#define VPX_VPX_DSP_X86_QUANTIZE_X86_H_

+

 #include <emmintrin.h>

 #include "./vpx_config.h"

@@ -75,3 +78,5 @@

   eob = _mm_max_epi16(eob, eob_shuffled);

   return _mm_extract_epi16(eob, 1);

 }

+

+#endif  // VPX_VPX_DSP_X86_QUANTIZE_X86_H_

--- a/vpx_dsp/x86/transpose_sse2.h

+++ b/vpx_dsp/x86/transpose_sse2.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_X86_TRANSPOSE_SSE2_H_

-#define VPX_DSP_X86_TRANSPOSE_SSE2_H_

+#ifndef VPX_VPX_DSP_X86_TRANSPOSE_SSE2_H_

+#define VPX_VPX_DSP_X86_TRANSPOSE_SSE2_H_

 #include <emmintrin.h>  // SSE2

@@ -364,4 +364,4 @@

   out[7] = _mm_unpackhi_epi64(a6, a7);

 }

-#endif  // VPX_DSP_X86_TRANSPOSE_SSE2_H_

+#endif  // VPX_VPX_DSP_X86_TRANSPOSE_SSE2_H_

--- a/vpx_dsp/x86/txfm_common_sse2.h

+++ b/vpx_dsp/x86/txfm_common_sse2.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_DSP_X86_TXFM_COMMON_SSE2_H_

-#define VPX_DSP_X86_TXFM_COMMON_SSE2_H_

+#ifndef VPX_VPX_DSP_X86_TXFM_COMMON_SSE2_H_

+#define VPX_VPX_DSP_X86_TXFM_COMMON_SSE2_H_

 #include <emmintrin.h>

 #include "vpx/vpx_integer.h"

@@ -29,4 +29,4 @@

   _mm_setr_epi16((int16_t)(a), (int16_t)(b), (int16_t)(c), (int16_t)(d), \

                  (int16_t)(e), (int16_t)(f), (int16_t)(g), (int16_t)(h))

-#endif  // VPX_DSP_X86_TXFM_COMMON_SSE2_H_

+#endif  // VPX_VPX_DSP_X86_TXFM_COMMON_SSE2_H_

--- a/vpx_mem/include/vpx_mem_intrnl.h

+++ b/vpx_mem/include/vpx_mem_intrnl.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_

-#define VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_

+#ifndef VPX_VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_

+#define VPX_VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_

 #include "./vpx_config.h"

 #define ADDRESS_STORAGE_SIZE sizeof(size_t)

@@ -28,4 +28,4 @@

 #define align_addr(addr, align) \

   (void *)(((size_t)(addr) + ((align)-1)) & ~(size_t)((align)-1))

-#endif  // VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_

+#endif  // VPX_VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_

--- a/vpx_mem/vpx_mem.h

+++ b/vpx_mem/vpx_mem.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_MEM_VPX_MEM_H_

-#define VPX_MEM_VPX_MEM_H_

+#ifndef VPX_VPX_MEM_VPX_MEM_H_

+#define VPX_VPX_MEM_VPX_MEM_H_

 #include "vpx_config.h"

 #if defined(__uClinux__)

@@ -49,4 +49,4 @@

 }

 #endif

-#endif  // VPX_MEM_VPX_MEM_H_

+#endif  // VPX_VPX_MEM_VPX_MEM_H_

--- a/vpx_ports/arm.h

+++ b/vpx_ports/arm.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_PORTS_ARM_H_

-#define VPX_PORTS_ARM_H_

+#ifndef VPX_VPX_PORTS_ARM_H_

+#define VPX_VPX_PORTS_ARM_H_

 #include <stdlib.h>

 #include "vpx_config.h"

@@ -36,4 +36,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_PORTS_ARM_H_

+#endif  // VPX_VPX_PORTS_ARM_H_

--- a/vpx_ports/asmdefs_mmi.h

+++ b/vpx_ports/asmdefs_mmi.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_PORTS_ASMDEFS_MMI_H_

-#define VPX_PORTS_ASMDEFS_MMI_H_

+#ifndef VPX_VPX_PORTS_ASMDEFS_MMI_H_

+#define VPX_VPX_PORTS_ASMDEFS_MMI_H_

 #include "./vpx_config.h"

 #include "vpx/vpx_integer.h"

@@ -78,4 +78,4 @@

 #endif /* HAVE_MMI */

-#endif /* VPX_PORTS_ASMDEFS_MMI_H_ */

+#endif  // VPX_VPX_PORTS_ASMDEFS_MMI_H_

--- a/vpx_ports/bitops.h

+++ b/vpx_ports/bitops.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_PORTS_BITOPS_H_

-#define VPX_PORTS_BITOPS_H_

+#ifndef VPX_VPX_PORTS_BITOPS_H_

+#define VPX_VPX_PORTS_BITOPS_H_

 #include <assert.h>

@@ -72,4 +72,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_PORTS_BITOPS_H_

+#endif  // VPX_VPX_PORTS_BITOPS_H_

--- a/vpx_ports/emmintrin_compat.h

+++ b/vpx_ports/emmintrin_compat.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_PORTS_EMMINTRIN_COMPAT_H_

-#define VPX_PORTS_EMMINTRIN_COMPAT_H_

+#ifndef VPX_VPX_PORTS_EMMINTRIN_COMPAT_H_

+#define VPX_VPX_PORTS_EMMINTRIN_COMPAT_H_

 #if defined(__GNUC__) && __GNUC__ < 4

 /* From emmintrin.h (gcc 4.5.3) */

@@ -52,4 +52,4 @@

 }

 #endif

-#endif  // VPX_PORTS_EMMINTRIN_COMPAT_H_

+#endif  // VPX_VPX_PORTS_EMMINTRIN_COMPAT_H_

--- a/vpx_ports/mem.h

+++ b/vpx_ports/mem.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_PORTS_MEM_H_

-#define VPX_PORTS_MEM_H_

+#ifndef VPX_VPX_PORTS_MEM_H_

+#define VPX_VPX_PORTS_MEM_H_

 #include "vpx_config.h"

 #include "vpx/vpx_integer.h"

@@ -51,4 +51,4 @@

 #define VPX_WITH_ASAN 0

 #endif  // __has_feature(address_sanitizer) || defined(__SANITIZE_ADDRESS__)

-#endif  // VPX_PORTS_MEM_H_

+#endif  // VPX_VPX_PORTS_MEM_H_

--- a/vpx_ports/mem_ops.h

+++ b/vpx_ports/mem_ops.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_PORTS_MEM_OPS_H_

-#define VPX_PORTS_MEM_OPS_H_

+#ifndef VPX_VPX_PORTS_MEM_OPS_H_

+#define VPX_VPX_PORTS_MEM_OPS_H_

 /* \file

  * \brief Provides portable memory access primitives

@@ -224,4 +224,4 @@

   mem[3] = (MAU_T)((val >> 24) & 0xff);

 }

 /* clang-format on */

-#endif  // VPX_PORTS_MEM_OPS_H_

+#endif  // VPX_VPX_PORTS_MEM_OPS_H_

--- a/vpx_ports/mem_ops_aligned.h

+++ b/vpx_ports/mem_ops_aligned.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_PORTS_MEM_OPS_ALIGNED_H_

-#define VPX_PORTS_MEM_OPS_ALIGNED_H_

+#ifndef VPX_VPX_PORTS_MEM_OPS_ALIGNED_H_

+#define VPX_VPX_PORTS_MEM_OPS_ALIGNED_H_

 #include "vpx/vpx_integer.h"

@@ -168,4 +168,4 @@

 #undef swap_endian_32_se

 /* clang-format on */

-#endif  // VPX_PORTS_MEM_OPS_ALIGNED_H_

+#endif  // VPX_VPX_PORTS_MEM_OPS_ALIGNED_H_

--- a/vpx_ports/msvc.h

+++ b/vpx_ports/msvc.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_PORTS_MSVC_H_

-#define VPX_PORTS_MSVC_H_

+#ifndef VPX_VPX_PORTS_MSVC_H_

+#define VPX_VPX_PORTS_MSVC_H_

 #ifdef _MSC_VER

 #include "./vpx_config.h"

@@ -29,4 +29,4 @@

 #endif  // _MSC_VER < 1800

 #endif  // _MSC_VER

-#endif  // VPX_PORTS_MSVC_H_

+#endif  // VPX_VPX_PORTS_MSVC_H_

--- a/vpx_ports/ppc.h

+++ b/vpx_ports/ppc.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_PORTS_PPC_H_

-#define VPX_PORTS_PPC_H_

+#ifndef VPX_VPX_PORTS_PPC_H_

+#define VPX_VPX_PORTS_PPC_H_

 #include <stdlib.h>

 #include "./vpx_config.h"

@@ -26,4 +26,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_PORTS_PPC_H_

+#endif  // VPX_VPX_PORTS_PPC_H_

--- a/vpx_ports/system_state.h

+++ b/vpx_ports/system_state.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_PORTS_SYSTEM_STATE_H_

-#define VPX_PORTS_SYSTEM_STATE_H_

+#ifndef VPX_VPX_PORTS_SYSTEM_STATE_H_

+#define VPX_VPX_PORTS_SYSTEM_STATE_H_

 #include "./vpx_config.h"

@@ -27,4 +27,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_PORTS_SYSTEM_STATE_H_

+#endif  // VPX_VPX_PORTS_SYSTEM_STATE_H_

--- a/vpx_ports/vpx_once.h

+++ b/vpx_ports/vpx_once.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_PORTS_VPX_ONCE_H_

-#define VPX_PORTS_VPX_ONCE_H_

+#ifndef VPX_VPX_PORTS_VPX_ONCE_H_

+#define VPX_VPX_PORTS_VPX_ONCE_H_

 #include "vpx_config.h"

@@ -137,4 +137,4 @@

 }

 #endif

-#endif  // VPX_PORTS_VPX_ONCE_H_

+#endif  // VPX_VPX_PORTS_VPX_ONCE_H_

--- a/vpx_ports/vpx_timer.h

+++ b/vpx_ports/vpx_timer.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_PORTS_VPX_TIMER_H_

-#define VPX_PORTS_VPX_TIMER_H_

+#ifndef VPX_VPX_PORTS_VPX_TIMER_H_

+#define VPX_VPX_PORTS_VPX_TIMER_H_

 #include "./vpx_config.h"

@@ -106,4 +106,4 @@

 #endif /* CONFIG_OS_SUPPORT */

-#endif  // VPX_PORTS_VPX_TIMER_H_

+#endif  // VPX_VPX_PORTS_VPX_TIMER_H_

--- a/vpx_ports/x86.h

+++ b/vpx_ports/x86.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_PORTS_X86_H_

-#define VPX_PORTS_X86_H_

+#ifndef VPX_VPX_PORTS_X86_H_

+#define VPX_VPX_PORTS_X86_H_

 #include <stdlib.h>

 #if defined(_MSC_VER)

@@ -332,4 +332,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_PORTS_X86_H_

+#endif  // VPX_VPX_PORTS_X86_H_

--- a/vpx_scale/vpx_scale.h

+++ b/vpx_scale/vpx_scale.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_SCALE_VPX_SCALE_H_

-#define VPX_SCALE_VPX_SCALE_H_

+#ifndef VPX_VPX_SCALE_VPX_SCALE_H_

+#define VPX_VPX_SCALE_VPX_SCALE_H_

 #include "vpx_scale/yv12config.h"

@@ -19,4 +19,4 @@

                             unsigned int vscale, unsigned int vratio,

                             unsigned int interlaced);

-#endif  // VPX_SCALE_VPX_SCALE_H_

+#endif  // VPX_VPX_SCALE_VPX_SCALE_H_

--- a/vpx_scale/yv12config.h

+++ b/vpx_scale/yv12config.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_SCALE_YV12CONFIG_H_

-#define VPX_SCALE_YV12CONFIG_H_

+#ifndef VPX_VPX_SCALE_YV12CONFIG_H_

+#define VPX_VPX_SCALE_YV12CONFIG_H_

 #ifdef __cplusplus

 extern "C" {

@@ -100,4 +100,4 @@

 }

 #endif

-#endif  // VPX_SCALE_YV12CONFIG_H_

+#endif  // VPX_VPX_SCALE_YV12CONFIG_H_

--- a/vpx_util/endian_inl.h

+++ b/vpx_util/endian_inl.h

@@ -9,8 +9,8 @@

 //

 // Endian related functions.

-#ifndef VPX_UTIL_ENDIAN_INL_H_

-#define VPX_UTIL_ENDIAN_INL_H_

+#ifndef VPX_VPX_UTIL_ENDIAN_INL_H_

+#define VPX_VPX_UTIL_ENDIAN_INL_H_

 #include <stdlib.h>

 #include "./vpx_config.h"

@@ -115,4 +115,4 @@

 #endif  // HAVE_BUILTIN_BSWAP64

 }

-#endif  // VPX_UTIL_ENDIAN_INL_H_

+#endif  // VPX_VPX_UTIL_ENDIAN_INL_H_

--- a/vpx_util/vpx_atomics.h

+++ b/vpx_util/vpx_atomics.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_UTIL_VPX_ATOMICS_H_

-#define VPX_UTIL_VPX_ATOMICS_H_

+#ifndef VPX_VPX_UTIL_VPX_ATOMICS_H_

+#define VPX_VPX_UTIL_VPX_ATOMICS_H_

 #include "./vpx_config.h"

@@ -108,4 +108,4 @@

 }  // extern "C"

 #endif  // __cplusplus

-#endif  // VPX_UTIL_VPX_ATOMICS_H_

+#endif  // VPX_VPX_UTIL_VPX_ATOMICS_H_

--- a/vpx_util/vpx_thread.h

+++ b/vpx_util/vpx_thread.h

@@ -12,8 +12,8 @@

 // Original source:

 //  https://chromium.googlesource.com/webm/libwebp

-#ifndef VPX_THREAD_H_

-#define VPX_THREAD_H_

+#ifndef VPX_VPX_UTIL_VPX_THREAD_H_

+#define VPX_VPX_UTIL_VPX_THREAD_H_

 #include "./vpx_config.h"

@@ -429,4 +429,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_THREAD_H_

+#endif  // VPX_VPX_UTIL_VPX_THREAD_H_

--- a/vpx_util/vpx_write_yuv_frame.h

+++ b/vpx_util/vpx_write_yuv_frame.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPX_UTIL_VPX_WRITE_YUV_FRAME_H_

-#define VPX_UTIL_VPX_WRITE_YUV_FRAME_H_

+#ifndef VPX_VPX_UTIL_VPX_WRITE_YUV_FRAME_H_

+#define VPX_VPX_UTIL_VPX_WRITE_YUV_FRAME_H_

 #include <stdio.h>

 #include "vpx_scale/yv12config.h"

@@ -24,4 +24,4 @@

 }  // extern "C"

 #endif

-#endif  // VPX_UTIL_VPX_WRITE_YUV_FRAME_H_

+#endif  // VPX_VPX_UTIL_VPX_WRITE_YUV_FRAME_H_

--- a/vpxenc.h

+++ b/vpxenc.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPXENC_H_

-#define VPXENC_H_

+#ifndef VPX_VPXENC_H_

+#define VPX_VPXENC_H_

 #include "vpx/vpx_encoder.h"

@@ -61,4 +61,4 @@

 }  // extern "C"

 #endif

-#endif  // VPXENC_H_

+#endif  // VPX_VPXENC_H_

--- a/vpxstats.h

+++ b/vpxstats.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef VPXSTATS_H_

-#define VPXSTATS_H_

+#ifndef VPX_VPXSTATS_H_

+#define VPX_VPXSTATS_H_

 #include <stdio.h>

@@ -40,4 +40,4 @@

 }  // extern "C"

 #endif

-#endif  // VPXSTATS_H_

+#endif  // VPX_VPXSTATS_H_

--- a/warnings.h

+++ b/warnings.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef WARNINGS_H_

-#define WARNINGS_H_

+#ifndef VPX_WARNINGS_H_

+#define VPX_WARNINGS_H_

 #ifdef __cplusplus

 extern "C" {

@@ -30,4 +30,4 @@

 }  // extern "C"

 #endif

-#endif  // WARNINGS_H_

+#endif  // VPX_WARNINGS_H_

--- a/webmdec.h

+++ b/webmdec.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef WEBMDEC_H_

-#define WEBMDEC_H_

+#ifndef VPX_WEBMDEC_H_

+#define VPX_WEBMDEC_H_

 #include "./tools_common.h"

@@ -66,4 +66,4 @@

 }  // extern "C"

 #endif

-#endif  // WEBMDEC_H_

+#endif  // VPX_WEBMDEC_H_

--- a/webmenc.h

+++ b/webmenc.h

@@ -7,8 +7,8 @@

  *  in the file PATENTS.  All contributing project authors may

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef WEBMENC_H_

-#define WEBMENC_H_

+#ifndef VPX_WEBMENC_H_

+#define VPX_WEBMENC_H_

 #include <stdio.h>

 #include <stdlib.h>

@@ -52,4 +52,4 @@

 }  // extern "C"

 #endif

-#endif  // WEBMENC_H_

+#endif  // VPX_WEBMENC_H_

--- a/y4menc.h

+++ b/y4menc.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

  */

-#ifndef Y4MENC_H_

-#define Y4MENC_H_

+#ifndef VPX_Y4MENC_H_

+#define VPX_Y4MENC_H_

 #include "./tools_common.h"

@@ -30,4 +30,4 @@

 }  // extern "C"

 #endif

-#endif  // Y4MENC_H_

+#endif  // VPX_Y4MENC_H_

--- a/y4minput.h

+++ b/y4minput.h

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

  *  Copyright (C) 2002-2010 The Xiph.Org Foundation and contributors.

  */

-#ifndef Y4MINPUT_H_

-#define Y4MINPUT_H_

+#ifndef VPX_Y4MINPUT_H_

+#define VPX_Y4MINPUT_H_

 #include <stdio.h>

 #include "vpx/vpx_image.h"

@@ -65,4 +65,4 @@

 }  // extern "C"

 #endif

-#endif  // Y4MINPUT_H_

+#endif  // VPX_Y4MINPUT_H_