Cosmetics - Fix header file order in unit tests
Change-Id: I9582a8d74990125b71e8fe620f7f3f2585a30798
diff --git a/test/blockiness_test.cc b/test/blockiness_test.cc
index 92cce6a..0c60baa 100644
--- a/test/blockiness_test.cc
+++ b/test/blockiness_test.cc
@@ -8,10 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-
-#include <string.h>
#include <limits.h>
#include <stdio.h>
+#include <string.h>
+
+#include "third_party/googletest/src/include/gtest/gtest.h"
#include "./vpx_config.h"
#if CONFIG_VP9_ENCODER
@@ -22,7 +23,6 @@
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
-#include "third_party/googletest/src/include/gtest/gtest.h"
#include "vpx_mem/vpx_mem.h"
diff --git a/test/consistency_test.cc b/test/consistency_test.cc
index 66f694c..db247a3 100644
--- a/test/consistency_test.cc
+++ b/test/consistency_test.cc
@@ -8,10 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-
-#include <string.h>
#include <limits.h>
#include <stdio.h>
+#include <string.h>
+
+#include "third_party/googletest/src/include/gtest/gtest.h"
#include "./vpx_config.h"
#if CONFIG_VP9_ENCODER
@@ -22,7 +23,6 @@
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
-#include "third_party/googletest/src/include/gtest/gtest.h"
#include "vp9/encoder/vp9_ssim.h"
#include "vpx_mem/vpx_mem.h"
diff --git a/test/convolve_test.cc b/test/convolve_test.cc
index c1c5d77..b66da68 100644
--- a/test/convolve_test.cc
+++ b/test/convolve_test.cc
@@ -9,14 +9,15 @@
*/
#include <string.h>
-#include "test/acm_random.h"
-#include "test/clear_system_state.h"
-#include "test/register_state_check.h"
-#include "test/util.h"
+
#include "third_party/googletest/src/include/gtest/gtest.h"
#include "./vpx_config.h"
#include "./vp9_rtcd.h"
+#include "test/acm_random.h"
+#include "test/clear_system_state.h"
+#include "test/register_state_check.h"
+#include "test/util.h"
#include "vp9/common/vp9_common.h"
#include "vp9/common/vp9_filter.h"
#include "vpx_mem/vpx_mem.h"
diff --git a/test/dct16x16_test.cc b/test/dct16x16_test.cc
index b1f7e7e..173e5bb 100644
--- a/test/dct16x16_test.cc
+++ b/test/dct16x16_test.cc
@@ -13,13 +13,13 @@
#include <string.h>
#include "third_party/googletest/src/include/gtest/gtest.h"
+
+#include "./vp9_rtcd.h"
+#include "./vpx_dsp_rtcd.h"
#include "test/acm_random.h"
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
-
-#include "./vp9_rtcd.h"
-#include "./vpx_dsp_rtcd.h"
#include "vp9/common/vp9_entropy.h"
#include "vp9/common/vp9_scan.h"
#include "vpx/vpx_codec.h"
diff --git a/test/dct32x32_test.cc b/test/dct32x32_test.cc
index f406fa2..70a2b23 100644
--- a/test/dct32x32_test.cc
+++ b/test/dct32x32_test.cc
@@ -12,15 +12,15 @@
#include <stdlib.h>
#include <string.h>
-#include "test/acm_random.h"
-#include "test/clear_system_state.h"
-#include "test/register_state_check.h"
-#include "test/util.h"
#include "third_party/googletest/src/include/gtest/gtest.h"
#include "./vp9_rtcd.h"
#include "./vpx_config.h"
#include "./vpx_dsp_rtcd.h"
+#include "test/acm_random.h"
+#include "test/clear_system_state.h"
+#include "test/register_state_check.h"
+#include "test/util.h"
#include "vp9/common/vp9_entropy.h"
#include "vpx/vpx_codec.h"
#include "vpx/vpx_integer.h"
diff --git a/test/decode_api_test.cc b/test/decode_api_test.cc
index 32be1f4..c10a44a 100644
--- a/test/decode_api_test.cc
+++ b/test/decode_api_test.cc
@@ -7,10 +7,11 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
+
#include "third_party/googletest/src/include/gtest/gtest.h"
-#include "test/ivf_video_source.h"
#include "./vpx_config.h"
+#include "test/ivf_video_source.h"
#include "vpx/vp8dx.h"
#include "vpx/vpx_decoder.h"
diff --git a/test/decode_test_driver.cc b/test/decode_test_driver.cc
index 7ce190c..ad861c3 100644
--- a/test/decode_test_driver.cc
+++ b/test/decode_test_driver.cc
@@ -7,9 +7,11 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
+
+#include "third_party/googletest/src/include/gtest/gtest.h"
+
#include "test/codec_factory.h"
#include "test/decode_test_driver.h"
-#include "third_party/googletest/src/include/gtest/gtest.h"
#include "test/register_state_check.h"
#include "test/video_source.h"
diff --git a/test/encode_test_driver.cc b/test/encode_test_driver.cc
index ff39f1a..e734bc9 100644
--- a/test/encode_test_driver.cc
+++ b/test/encode_test_driver.cc
@@ -10,13 +10,14 @@
#include <string>
+#include "third_party/googletest/src/include/gtest/gtest.h"
+
#include "./vpx_config.h"
#include "test/codec_factory.h"
-#include "test/encode_test_driver.h"
#include "test/decode_test_driver.h"
+#include "test/encode_test_driver.h"
#include "test/register_state_check.h"
#include "test/video_source.h"
-#include "third_party/googletest/src/include/gtest/gtest.h"
namespace libvpx_test {
void Encoder::InitEncoder(VideoSource *video) {
diff --git a/test/encode_test_driver.h b/test/encode_test_driver.h
index 7a068bf..f7c9621 100644
--- a/test/encode_test_driver.h
+++ b/test/encode_test_driver.h
@@ -13,12 +13,13 @@
#include <string>
#include <vector>
-#include "./vpx_config.h"
#include "third_party/googletest/src/include/gtest/gtest.h"
-#include "vpx/vpx_encoder.h"
+
+#include "./vpx_config.h"
#if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER
#include "vpx/vp8cx.h"
#endif
+#include "vpx/vpx_encoder.h"
namespace libvpx_test {
diff --git a/test/fdct4x4_test.cc b/test/fdct4x4_test.cc
index 7573801..9dcf636 100644
--- a/test/fdct4x4_test.cc
+++ b/test/fdct4x4_test.cc
@@ -13,13 +13,13 @@
#include <string.h>
#include "third_party/googletest/src/include/gtest/gtest.h"
+
+#include "./vp9_rtcd.h"
+#include "./vpx_dsp_rtcd.h"
#include "test/acm_random.h"
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
-
-#include "./vp9_rtcd.h"
-#include "./vpx_dsp_rtcd.h"
#include "vp9/common/vp9_entropy.h"
#include "vpx/vpx_codec.h"
#include "vpx/vpx_integer.h"
diff --git a/test/fdct8x8_test.cc b/test/fdct8x8_test.cc
index fb7fbb5..eeafde1 100644
--- a/test/fdct8x8_test.cc
+++ b/test/fdct8x8_test.cc
@@ -13,13 +13,13 @@
#include <string.h>
#include "third_party/googletest/src/include/gtest/gtest.h"
+
+#include "./vp9_rtcd.h"
+#include "./vpx_dsp_rtcd.h"
#include "test/acm_random.h"
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
-
-#include "./vp9_rtcd.h"
-#include "./vpx_dsp_rtcd.h"
#include "vp9/common/vp9_entropy.h"
#include "vp9/common/vp9_scan.h"
#include "vpx/vpx_codec.h"
diff --git a/test/idct_test.cc b/test/idct_test.cc
index 34b721f..39db3e4 100644
--- a/test/idct_test.cc
+++ b/test/idct_test.cc
@@ -10,10 +10,11 @@
#include "./vpx_config.h"
#include "./vp8_rtcd.h"
-#include "test/clear_system_state.h"
-#include "test/register_state_check.h"
+
#include "third_party/googletest/src/include/gtest/gtest.h"
+#include "test/clear_system_state.h"
+#include "test/register_state_check.h"
#include "vpx/vpx_integer.h"
typedef void (*IdctFunc)(int16_t *input, unsigned char *pred_ptr,
diff --git a/test/intrapred_test.cc b/test/intrapred_test.cc
index 6a6a5ed..65a0697 100644
--- a/test/intrapred_test.cc
+++ b/test/intrapred_test.cc
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-
#include <string.h>
-#include "test/acm_random.h"
-#include "test/clear_system_state.h"
-#include "test/register_state_check.h"
+
#include "third_party/googletest/src/include/gtest/gtest.h"
#include "./vpx_config.h"
#include "./vp8_rtcd.h"
+#include "test/acm_random.h"
+#include "test/clear_system_state.h"
+#include "test/register_state_check.h"
#include "vp8/common/blockd.h"
#include "vpx_mem/vpx_mem.h"
diff --git a/test/lpf_8_test.cc b/test/lpf_8_test.cc
index 96aaa23..966e109 100644
--- a/test/lpf_8_test.cc
+++ b/test/lpf_8_test.cc
@@ -13,13 +13,13 @@
#include <string>
#include "third_party/googletest/src/include/gtest/gtest.h"
+
+#include "./vpx_config.h"
+#include "./vpx_dsp_rtcd.h"
#include "test/acm_random.h"
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
-
-#include "./vpx_config.h"
-#include "./vpx_dsp_rtcd.h"
#include "vp9/common/vp9_entropy.h"
#include "vp9/common/vp9_loopfilter.h"
#include "vpx/vpx_integer.h"
diff --git a/test/partial_idct_test.cc b/test/partial_idct_test.cc
index 6d77b7c..09cd09b 100644
--- a/test/partial_idct_test.cc
+++ b/test/partial_idct_test.cc
@@ -13,13 +13,13 @@
#include <string.h>
#include "third_party/googletest/src/include/gtest/gtest.h"
+
+#include "./vp9_rtcd.h"
+#include "./vpx_dsp_rtcd.h"
#include "test/acm_random.h"
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
-
-#include "./vp9_rtcd.h"
-#include "./vpx_dsp_rtcd.h"
#include "vp9/common/vp9_blockd.h"
#include "vp9/common/vp9_scan.h"
#include "vpx/vpx_integer.h"
diff --git a/test/quantize_test.cc b/test/quantize_test.cc
index 46e463d..a62eabc 100644
--- a/test/quantize_test.cc
+++ b/test/quantize_test.cc
@@ -11,13 +11,13 @@
#include <string.h>
#include "third_party/googletest/src/include/gtest/gtest.h"
+
+#include "./vpx_config.h"
+#include "./vp8_rtcd.h"
#include "test/acm_random.h"
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
-
-#include "./vpx_config.h"
-#include "./vp8_rtcd.h"
#include "vp8/common/blockd.h"
#include "vp8/common/onyx.h"
#include "vp8/encoder/block.h"
diff --git a/test/sad_test.cc b/test/sad_test.cc
index 1c17bfe..e6a5e0b 100644
--- a/test/sad_test.cc
+++ b/test/sad_test.cc
@@ -13,18 +13,17 @@
#include <limits.h>
#include <stdio.h>
+#include "third_party/googletest/src/include/gtest/gtest.h"
+
#include "./vpx_config.h"
#include "./vpx_dsp_rtcd.h"
-#include "vpx_mem/vpx_mem.h"
-#include "vpx_ports/mem.h"
-
#include "test/acm_random.h"
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
-#include "third_party/googletest/src/include/gtest/gtest.h"
#include "vpx/vpx_codec.h"
-
+#include "vpx_mem/vpx_mem.h"
+#include "vpx_ports/mem.h"
typedef unsigned int (*SadMxNFunc)(const uint8_t *src_ptr,
int src_stride,
diff --git a/test/sixtap_predict_test.cc b/test/sixtap_predict_test.cc
index 07383ae..8c7c98d 100644
--- a/test/sixtap_predict_test.cc
+++ b/test/sixtap_predict_test.cc
@@ -11,13 +11,15 @@
#include <math.h>
#include <stdlib.h>
#include <string.h>
+
+#include "third_party/googletest/src/include/gtest/gtest.h"
+
+#include "./vpx_config.h"
+#include "./vp8_rtcd.h"
#include "test/acm_random.h"
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
-#include "third_party/googletest/src/include/gtest/gtest.h"
-#include "./vpx_config.h"
-#include "./vp8_rtcd.h"
#include "vpx/vpx_integer.h"
#include "vpx_mem/vpx_mem.h"
diff --git a/test/test_libvpx.cc b/test/test_libvpx.cc
index 9b29fed..2649917 100644
--- a/test/test_libvpx.cc
+++ b/test/test_libvpx.cc
@@ -8,6 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include <string>
+
+#include "third_party/googletest/src/include/gtest/gtest.h"
+
#include "./vpx_config.h"
#if ARCH_X86 || ARCH_X86_64
#include "vpx_ports/x86.h"
@@ -22,7 +25,6 @@
extern void vpx_dsp_rtcd();
extern void vpx_scale_rtcd();
}
-#include "third_party/googletest/src/include/gtest/gtest.h"
static void append_negative_gtest_filter(const char *str) {
std::string filter = ::testing::FLAGS_gtest_filter;
diff --git a/test/variance_test.cc b/test/variance_test.cc
index 74775bb..7a34db6 100644
--- a/test/variance_test.cc
+++ b/test/variance_test.cc
@@ -11,17 +11,17 @@
#include <cstdlib>
#include <new>
-#include "test/acm_random.h"
-#include "test/clear_system_state.h"
-#include "test/register_state_check.h"
#include "third_party/googletest/src/include/gtest/gtest.h"
#include "./vpx_config.h"
+#include "./vpx_dsp_rtcd.h"
+#include "test/acm_random.h"
+#include "test/clear_system_state.h"
+#include "test/register_state_check.h"
#include "vpx/vpx_codec.h"
#include "vpx/vpx_integer.h"
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h"
-#include "./vpx_dsp_rtcd.h"
namespace {
diff --git a/test/vp8_boolcoder_test.cc b/test/vp8_boolcoder_test.cc
index 99b5f0c..02d7162 100644
--- a/test/vp8_boolcoder_test.cc
+++ b/test/vp8_boolcoder_test.cc
@@ -16,12 +16,12 @@
#include <string.h>
#include <sys/types.h>
-#include "test/acm_random.h"
#include "third_party/googletest/src/include/gtest/gtest.h"
-#include "vpx/vpx_integer.h"
-#include "vp8/encoder/boolhuff.h"
+#include "test/acm_random.h"
#include "vp8/decoder/dboolhuff.h"
+#include "vp8/encoder/boolhuff.h"
+#include "vpx/vpx_integer.h"
namespace {
const int num_tests = 10;
diff --git a/test/vp8_fdct4x4_test.cc b/test/vp8_fdct4x4_test.cc
index bdbf74e..11a653d 100644
--- a/test/vp8_fdct4x4_test.cc
+++ b/test/vp8_fdct4x4_test.cc
@@ -15,10 +15,10 @@
#include <string.h>
#include <sys/types.h>
-#include "./vp8_rtcd.h"
-
-#include "test/acm_random.h"
#include "third_party/googletest/src/include/gtest/gtest.h"
+
+#include "./vp8_rtcd.h"
+#include "test/acm_random.h"
#include "vpx/vpx_integer.h"
namespace {
diff --git a/test/vp9_arf_freq_test.cc b/test/vp9_arf_freq_test.cc
index 07968bc..aa3e34d 100644
--- a/test/vp9_arf_freq_test.cc
+++ b/test/vp9_arf_freq_test.cc
@@ -8,12 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "third_party/googletest/src/include/gtest/gtest.h"
+
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
+#include "test/util.h"
#include "test/y4m_video_source.h"
#include "test/yuv_video_source.h"
-#include "test/util.h"
-#include "third_party/googletest/src/include/gtest/gtest.h"
#include "vp9/encoder/vp9_ratectrl.h"
namespace {
diff --git a/test/vp9_avg_test.cc b/test/vp9_avg_test.cc
index 09c2069..d383131 100644
--- a/test/vp9_avg_test.cc
+++ b/test/vp9_avg_test.cc
@@ -8,22 +8,22 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-
-#include <string.h>
#include <limits.h>
#include <stdio.h>
+#include <string.h>
+
+#include "third_party/googletest/src/include/gtest/gtest.h"
#include "./vpx_config.h"
#if CONFIG_VP9_ENCODER
#include "./vp9_rtcd.h"
#endif
-#include "vpx_mem/vpx_mem.h"
#include "test/acm_random.h"
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
-#include "third_party/googletest/src/include/gtest/gtest.h"
+#include "vpx_mem/vpx_mem.h"
using libvpx_test::ACMRandom;
diff --git a/test/vp9_boolcoder_test.cc b/test/vp9_boolcoder_test.cc
index b917429..c61bb4a 100644
--- a/test/vp9_boolcoder_test.cc
+++ b/test/vp9_boolcoder_test.cc
@@ -14,12 +14,11 @@
#include "third_party/googletest/src/include/gtest/gtest.h"
+#include "test/acm_random.h"
#include "vpx/vpx_integer.h"
#include "vpx_dsp/bitreader.h"
#include "vpx_dsp/bitwriter.h"
-#include "test/acm_random.h"
-
using libvpx_test::ACMRandom;
namespace {
diff --git a/test/vp9_encoder_parms_get_to_decoder.cc b/test/vp9_encoder_parms_get_to_decoder.cc
index c477af9..2049466 100644
--- a/test/vp9_encoder_parms_get_to_decoder.cc
+++ b/test/vp9_encoder_parms_get_to_decoder.cc
@@ -8,12 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "third_party/googletest/src/include/gtest/gtest.h"
+
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
+#include "test/util.h"
#include "test/y4m_video_source.h"
#include "test/yuv_video_source.h"
-#include "test/util.h"
-#include "third_party/googletest/src/include/gtest/gtest.h"
#include "vp9/decoder/vp9_decoder.h"
typedef vpx_codec_stream_info_t vp9_stream_info_t;
diff --git a/test/vp9_end_to_end_test.cc b/test/vp9_end_to_end_test.cc
index b7dd932..0fea603 100644
--- a/test/vp9_end_to_end_test.cc
+++ b/test/vp9_end_to_end_test.cc
@@ -8,12 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "third_party/googletest/src/include/gtest/gtest.h"
+
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
+#include "test/util.h"
#include "test/y4m_video_source.h"
#include "test/yuv_video_source.h"
-#include "test/util.h"
-#include "third_party/googletest/src/include/gtest/gtest.h"
namespace {
diff --git a/test/vp9_error_block_test.cc b/test/vp9_error_block_test.cc
index ac19c2e..8c5d5a2 100644
--- a/test/vp9_error_block_test.cc
+++ b/test/vp9_error_block_test.cc
@@ -14,12 +14,12 @@
#include "third_party/googletest/src/include/gtest/gtest.h"
+#include "./vpx_config.h"
+#include "./vp9_rtcd.h"
#include "test/acm_random.h"
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "test/util.h"
-#include "./vpx_config.h"
-#include "./vp9_rtcd.h"
#include "vp9/common/vp9_entropy.h"
#include "vpx/vpx_codec.h"
#include "vpx/vpx_integer.h"
diff --git a/test/vp9_intrapred_test.cc b/test/vp9_intrapred_test.cc
index c17259a..ad3327e 100644
--- a/test/vp9_intrapred_test.cc
+++ b/test/vp9_intrapred_test.cc
@@ -10,17 +10,17 @@
#include <string>
-#include "test/acm_random.h"
-#include "test/clear_system_state.h"
-#include "test/register_state_check.h"
#include "third_party/googletest/src/include/gtest/gtest.h"
#include "./vpx_config.h"
#include "./vpx_dsp_rtcd.h"
+#include "test/acm_random.h"
+#include "test/clear_system_state.h"
+#include "test/register_state_check.h"
+#include "test/util.h"
#include "vp9/common/vp9_blockd.h"
#include "vp9/common/vp9_pred_common.h"
#include "vpx_mem/vpx_mem.h"
-#include "test/util.h"
namespace {
diff --git a/test/vp9_lossless_test.cc b/test/vp9_lossless_test.cc
index 67215d3..4177393 100644
--- a/test/vp9_lossless_test.cc
+++ b/test/vp9_lossless_test.cc
@@ -7,8 +7,10 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "./vpx_config.h"
+
#include "third_party/googletest/src/include/gtest/gtest.h"
+
+#include "./vpx_config.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
#include "test/i420_video_source.h"
diff --git a/test/vp9_subtract_test.cc b/test/vp9_subtract_test.cc
index a1798d7..d78b277 100644
--- a/test/vp9_subtract_test.cc
+++ b/test/vp9_subtract_test.cc
@@ -9,12 +9,13 @@
*/
#include "third_party/googletest/src/include/gtest/gtest.h"
+
+#include "./vp9_rtcd.h"
+#include "./vpx_config.h"
+#include "./vpx_dsp_rtcd.h"
#include "test/acm_random.h"
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
-#include "./vpx_config.h"
-#include "./vp9_rtcd.h"
-#include "./vpx_dsp_rtcd.h"
#include "vp9/common/vp9_blockd.h"
#include "vpx_mem/vpx_mem.h"
diff --git a/test/vpx_scale_test.cc b/test/vpx_scale_test.cc
index b30a06be..ef716fc 100644
--- a/test/vpx_scale_test.cc
+++ b/test/vpx_scale_test.cc
@@ -10,11 +10,10 @@
#include "third_party/googletest/src/include/gtest/gtest.h"
-#include "test/clear_system_state.h"
-#include "test/register_state_check.h"
-
#include "./vpx_config.h"
#include "./vpx_scale_rtcd.h"
+#include "test/clear_system_state.h"
+#include "test/register_state_check.h"
#include "vpx_mem/vpx_mem.h"
#include "vpx_scale/yv12config.h"
diff --git a/test/y4m_test.cc b/test/y4m_test.cc
index 58a6fe3..a555329 100644
--- a/test/y4m_test.cc
+++ b/test/y4m_test.cc
@@ -9,12 +9,14 @@
*/
#include <string>
+
+#include "third_party/googletest/src/include/gtest/gtest.h"
+
+#include "./vpx_config.h"
+#include "./y4menc.h"
#include "test/md5_helper.h"
#include "test/util.h"
#include "test/y4m_video_source.h"
-#include "third_party/googletest/src/include/gtest/gtest.h"
-#include "./vpx_config.h"
-#include "./y4menc.h"
namespace {
