Replace vpx_ports/config.h with vpx_config.h

Just a clean-up.

Change-Id: Iea5b6dc925dcfa7db548bc1ab1a13d26ed5a2c9a

diff --git a/examples.mk b/examples.mk
index 4ebb035d91bbdffb94ca119ed1fbf153facff073..b6bf882e58c645bb52b32f9d29368eb3cb8e26a2 100644 (file)
--- a/examples.mk
+++ b/examples.mk
@@ -16,7 +16,7 @@ UTILS-$(CONFIG_DECODERS)    += vpxdec.c
 vpxdec.SRCS                 += md5_utils.c md5_utils.h
 vpxdec.SRCS                 += vpx_ports/vpx_timer.h
 vpxdec.SRCS                 += vpx/vpx_integer.h
-vpxdec.SRCS                 += args.c args.h vpx_ports/config.h
+vpxdec.SRCS                 += args.c args.h
 vpxdec.SRCS                 += tools_common.c tools_common.h
 vpxdec.SRCS                 += nestegg/halloc/halloc.h
 vpxdec.SRCS                 += nestegg/halloc/src/align.h
@@ -30,7 +30,7 @@ vpxdec.DESCRIPTION           = Full featured decoder
 UTILS-$(CONFIG_ENCODERS)    += vpxenc.c
 vpxenc.SRCS                 += args.c args.h y4minput.c y4minput.h
 vpxenc.SRCS                 += tools_common.c tools_common.h
-vpxenc.SRCS                 += vpx_ports/config.h vpx_ports/mem_ops.h
+vpxenc.SRCS                 += vpx_ports/mem_ops.h
 vpxenc.SRCS                 += vpx_ports/mem_ops_aligned.h
 vpxenc.SRCS                 += libmkv/EbmlIDs.h
 vpxenc.SRCS                 += libmkv/EbmlWriter.c

diff --git a/vp8/common/alloccommon.c b/vp8/common/alloccommon.c
index d732317870bac944b8887589f8584e26d63f9e2c..97a3559a4dcab60ea8310d47457457ec22e79eff 100644 (file)
--- a/vp8/common/alloccommon.c
+++ b/vp8/common/alloccommon.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "blockd.h"
 #include "vpx_mem/vpx_mem.h"
 #include "onyxc_int.h"

diff --git a/vp8/common/arm/arm_systemdependent.c b/vp8/common/arm/arm_systemdependent.c
index c0467cd843d0c215150a4187c33d32b0c5893145..2b45afe4b812003076c3d13056b85ce783d74d2f 100644 (file)
--- a/vp8/common/arm/arm_systemdependent.c
+++ b/vp8/common/arm/arm_systemdependent.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx_ports/arm.h"
 #include "vp8/common/g_common.h"
 #include "vp8/common/pragmas.h"

diff --git a/vp8/common/arm/filter_arm.c b/vp8/common/arm/filter_arm.c
index 6582fb29aaeb3e771941b9035fbc1a8341e0db92..6d95eb8e349db3276dc92cad020d1c259ee2d54a 100644 (file)
--- a/vp8/common/arm/filter_arm.c
+++ b/vp8/common/arm/filter_arm.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include <math.h>
 #include "vp8/common/filter.h"
 #include "vp8/common/subpixel.h"

diff --git a/vp8/common/arm/neon/recon_neon.c b/vp8/common/arm/neon/recon_neon.c
index 09fd2a56f58d6b7f5ab2a9d5c0470e8a6106978c..d2aafd51f0f1f1b29623343b598e71b1c39d0d9d 100644 (file)
--- a/vp8/common/arm/neon/recon_neon.c
+++ b/vp8/common/arm/neon/recon_neon.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/common/recon.h"
 #include "vp8/common/blockd.h"
 

diff --git a/vp8/common/arm/reconintra_arm.c b/vp8/common/arm/reconintra_arm.c
index f8f4dca3e7385e258d0b6621a2da97501048f6fc..cd82baf7cff38982e41108a1e3f9f3630726c76c 100644 (file)
--- a/vp8/common/arm/reconintra_arm.c
+++ b/vp8/common/arm/reconintra_arm.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/common/blockd.h"
 #include "vp8/common/reconintra.h"
 #include "vpx_mem/vpx_mem.h"

diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h
index 61c21d19f003abf7368cb92cb42f727f63a84b1b..6cb3fe1bb1c888fee86007593a951dcd308b0b8d 100644 (file)
--- a/vp8/common/blockd.h
+++ b/vp8/common/blockd.h
@@ -14,7 +14,7 @@
 
 void vpx_log(const char *format, ...);
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx_scale/yv12config.h"
 #include "mv.h"
 #include "treecoder.h"

diff --git a/vp8/common/generic/systemdependent.c b/vp8/common/generic/systemdependent.c
index c61629407d829c997931c93f10a51cc737e03442..d1dd602869c149abc9374183e4abcd8c6711a4a5 100644 (file)
--- a/vp8/common/generic/systemdependent.c
+++ b/vp8/common/generic/systemdependent.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/common/g_common.h"
 #include "vp8/common/subpixel.h"
 #include "vp8/common/loopfilter.h"

diff --git a/vp8/common/invtrans.h b/vp8/common/invtrans.h
index b3ffb70734cda4f7230161b10c7da86e9ae21bd2..d14573b91ccde34b8336093f4c50305efb5053b5 100644 (file)
--- a/vp8/common/invtrans.h
+++ b/vp8/common/invtrans.h
@@ -12,7 +12,7 @@
 #ifndef __INC_INVTRANS_H
 #define __INC_INVTRANS_H
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "idct.h"
 #include "blockd.h"
 extern void vp8_inverse_transform_b(const vp8_idct_rtcd_vtable_t *rtcd, BLOCKD *b, int pitch);

diff --git a/vp8/common/postproc.c b/vp8/common/postproc.c
index 14c3b7bf354d6c1b7f5bbf586f648125a64cfe08..ace4c113ced4731e0c377f46d4a80b22a28722ba 100644 (file)
--- a/vp8/common/postproc.c
+++ b/vp8/common/postproc.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx_scale/yv12config.h"
 #include "postproc.h"
 #include "vpx_scale/yv12extend.h"

diff --git a/vp8/common/recon.c b/vp8/common/recon.c
index d72d6e4104406c7a98d790e97a225d36814b4046..eebf6dcb9e9e3b1e0ffe9ca99ed6b3738c92fb05 100644 (file)
--- a/vp8/common/recon.c
+++ b/vp8/common/recon.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "recon.h"
 #include "blockd.h"
 

diff --git a/vp8/common/reconinter.c b/vp8/common/reconinter.c
index 064a8355ce3c47b61135a6b1fbb62676fb45abff..b992440aee94fab4f3c634ba5ea92c5761e37982 100644 (file)
--- a/vp8/common/reconinter.c
+++ b/vp8/common/reconinter.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx/vpx_integer.h"
 #include "recon.h"
 #include "subpixel.h"

diff --git a/vp8/common/reconintra.c b/vp8/common/reconintra.c
index 9cf5f6a88d25caad66d9f96d16302aa12f0d23af..16dadc47d0b80b8b942699bf6437ee04f7bc1161 100644 (file)
--- a/vp8/common/reconintra.c
+++ b/vp8/common/reconintra.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "recon.h"
 #include "reconintra.h"
 #include "vpx_mem/vpx_mem.h"

diff --git a/vp8/common/reconintra4x4.c b/vp8/common/reconintra4x4.c
index 18c514541b6687a414a0b4db9caafab62ab5e9ba..0e1ebb584117c0e36774b001334e6e50b319e259 100644 (file)
--- a/vp8/common/reconintra4x4.c
+++ b/vp8/common/reconintra4x4.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "recon.h"
 #include "vpx_mem/vpx_mem.h"
 #include "reconintra.h"

diff --git a/vp8/common/systemdependent.h b/vp8/common/systemdependent.h
index db996987a18147949a21af59862a5c4865e3b296..f99c4bb2af5f72340ca45898cd1fa67bc44c4427 100644 (file)
--- a/vp8/common/systemdependent.h
+++ b/vp8/common/systemdependent.h
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #if ARCH_X86 || ARCH_X86_64
 void vpx_reset_mmx_state(void);
 #define vp8_clear_system_state() vpx_reset_mmx_state()

diff --git a/vp8/common/x86/recon_wrapper_sse2.c b/vp8/common/x86/recon_wrapper_sse2.c
index cb7b69c08d6bff25a01732022146d5b46ccf3a8b..fcc75a9013ad7ef77d1e3550405a134c8e608fe5 100644 (file)
--- a/vp8/common/x86/recon_wrapper_sse2.c
+++ b/vp8/common/x86/recon_wrapper_sse2.c
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/common/recon.h"
 #include "recon_x86.h"
 #include "vpx_mem/vpx_mem.h"

diff --git a/vp8/common/x86/vp8_asm_stubs.c b/vp8/common/x86/vp8_asm_stubs.c
index 79040060937a4122390cbab74396e37e40250a10..bce7bc38e2d14d6332fe1d6ad82cf2ae8f256899 100644 (file)
--- a/vp8/common/x86/vp8_asm_stubs.c
+++ b/vp8/common/x86/vp8_asm_stubs.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx_ports/mem.h"
 #include "vp8/common/subpixel.h"
 

diff --git a/vp8/decoder/arm/arm_dsystemdependent.c b/vp8/decoder/arm/arm_dsystemdependent.c
index 6ce471217d3cdf75b6a86369458bb1c8c7b3f77f..1b0091cdbdfbf51e82299d7c71108306a6f9baed 100644 (file)
--- a/vp8/decoder/arm/arm_dsystemdependent.c
+++ b/vp8/decoder/arm/arm_dsystemdependent.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx_ports/arm.h"
 #include "vp8/common/blockd.h"
 #include "vp8/common/pragmas.h"

diff --git a/vp8/decoder/arm/armv6/idct_blk_v6.c b/vp8/decoder/arm/armv6/idct_blk_v6.c
index 57c34469888bb942285ac3f462a52eda5b649b0a..5c7592f357974610be6d070664e038bbc24568c2 100644 (file)
--- a/vp8/decoder/arm/armv6/idct_blk_v6.c
+++ b/vp8/decoder/arm/armv6/idct_blk_v6.c
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/common/idct.h"
 #include "vp8/decoder/dequantize.h"
 

diff --git a/vp8/decoder/arm/dequantize_arm.c b/vp8/decoder/arm/dequantize_arm.c
index 98db6eefff30b36c192b983d658024ce8461a806..2918e05122271abad57f2104243d785336f78fef 100644 (file)
--- a/vp8/decoder/arm/dequantize_arm.c
+++ b/vp8/decoder/arm/dequantize_arm.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/decoder/dequantize.h"
 #include "vp8/common/idct.h"
 #include "vpx_mem/vpx_mem.h"

diff --git a/vp8/decoder/arm/neon/idct_blk_neon.c b/vp8/decoder/arm/neon/idct_blk_neon.c
index ee35004254a26044132077e318e946fb2be7c3a8..f31654060ba18f205b352f8eb908d5b06db508c9 100644 (file)
--- a/vp8/decoder/arm/neon/idct_blk_neon.c
+++ b/vp8/decoder/arm/neon/idct_blk_neon.c
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/common/idct.h"
 #include "vp8/decoder/dequantize.h"
 

diff --git a/vp8/decoder/dboolhuff.h b/vp8/decoder/dboolhuff.h
index 853c10f145234c20a44e409c91739886eb9e4c0a..880c185224266affe0ef31b953feb2083c484c83 100644 (file)
--- a/vp8/decoder/dboolhuff.h
+++ b/vp8/decoder/dboolhuff.h
@@ -13,7 +13,7 @@
 #define DBOOLHUFF_H
 #include <stddef.h>
 #include <limits.h>
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx_ports/mem.h"
 #include "vpx/vpx_integer.h"
 

diff --git a/vp8/decoder/dequantize.c b/vp8/decoder/dequantize.c
index dd0c13b7dc1b6f9bb3b0c5d800f14eb8de1b82c2..a60442fe86a617ce9bdea67ac8387a751fc0e230 100644 (file)
--- a/vp8/decoder/dequantize.c
+++ b/vp8/decoder/dequantize.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "dequantize.h"
 #include "vp8/common/idct.h"
 #include "vpx_mem/vpx_mem.h"

diff --git a/vp8/decoder/generic/dsystemdependent.c b/vp8/decoder/generic/dsystemdependent.c
index 2406deaaf272dfa880c447eb655e62bfcdeb2db3..9c42bc62d41e703db3a7a445a822a4482726ea4d 100644 (file)
--- a/vp8/decoder/generic/dsystemdependent.c
+++ b/vp8/decoder/generic/dsystemdependent.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/decoder/dequantize.h"
 #include "vp8/decoder/onyxd_int.h"
 

diff --git a/vp8/decoder/idct_blk.c b/vp8/decoder/idct_blk.c
index df0192354c051bd53474ae5d30f63c850ce0866c..04bce665e220b02e54314c0d46e1ecf4a8d10257 100644 (file)
--- a/vp8/decoder/idct_blk.c
+++ b/vp8/decoder/idct_blk.c
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/common/idct.h"
 #include "dequantize.h"
 

diff --git a/vp8/decoder/onyxd_int.h b/vp8/decoder/onyxd_int.h
index 4ece4312a0b6fa45d6e795cee76c049bfae6c7f7..a84f169141fdcd0c978080819f110742767f3c01 100644 (file)
--- a/vp8/decoder/onyxd_int.h
+++ b/vp8/decoder/onyxd_int.h
@@ -11,7 +11,7 @@
 
 #ifndef __INC_VP8D_INT_H
 #define __INC_VP8D_INT_H
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/common/onyxd.h"
 #include "treereader.h"
 #include "vp8/common/onyxc_int.h"

diff --git a/vp8/decoder/reconintra_mt.c b/vp8/decoder/reconintra_mt.c
index b9d2b370364130c710939d13bb25445d1c7f88dc..9bba5b75fd2680823eb6c25668b92b02e7e6f3e1 100644 (file)
--- a/vp8/decoder/reconintra_mt.c
+++ b/vp8/decoder/reconintra_mt.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/common/recon.h"
 #include "vp8/common/reconintra.h"
 #include "vpx_mem/vpx_mem.h"

diff --git a/vp8/decoder/x86/idct_blk_mmx.c b/vp8/decoder/x86/idct_blk_mmx.c
index 8f1a363cd7827818aeb8b6bad02505b04082bb2c..558dbaf7eeed3721053a37580f7ff40a31fd4283 100644 (file)
--- a/vp8/decoder/x86/idct_blk_mmx.c
+++ b/vp8/decoder/x86/idct_blk_mmx.c
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/common/idct.h"
 #include "vp8/decoder/dequantize.h"
 

diff --git a/vp8/decoder/x86/idct_blk_sse2.c b/vp8/decoder/x86/idct_blk_sse2.c
index 3a48068622af43ea99c6f5fd0f368d4462c4a9ba..a6a720639ff7e613e53c09f72668b381a5ec0467 100644 (file)
--- a/vp8/decoder/x86/idct_blk_sse2.c
+++ b/vp8/decoder/x86/idct_blk_sse2.c
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/common/idct.h"
 #include "vp8/decoder/dequantize.h"
 

diff --git a/vp8/decoder/x86/x86_dsystemdependent.c b/vp8/decoder/x86/x86_dsystemdependent.c
index a244a3a98b0a68482774d7e1149c9744870c57ec..443150483c47cbed27e29f92395ca16393444fa4 100644 (file)
--- a/vp8/decoder/x86/x86_dsystemdependent.c
+++ b/vp8/decoder/x86/x86_dsystemdependent.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx_ports/x86.h"
 #include "vp8/decoder/onyxd_int.h"
 

diff --git a/vp8/encoder/arm/arm_csystemdependent.c b/vp8/encoder/arm/arm_csystemdependent.c
index 89f8136fe9e995d8e20fcc1dfb540bcfcf478e13..94250844c826cc8a2ce3557946c3050e6016c1a3 100644 (file)
--- a/vp8/encoder/arm/arm_csystemdependent.c
+++ b/vp8/encoder/arm/arm_csystemdependent.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx_ports/arm.h"
 #include "vp8/encoder/variance.h"
 #include "vp8/encoder/onyx_int.h"

diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c
index 19b52a3bfd205b31a36f9fcb0c2702dabc12f03b..510e4cc98bd0292d65acf29e9e62387df4fb5e4a 100644 (file)
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "encodemb.h"
 #include "encodemv.h"
 #include "vp8/common/common.h"

diff --git a/vp8/encoder/encodeintra.c b/vp8/encoder/encodeintra.c
index 59db0253b466b3d8f3fdb3316da60857172174af..4a77c1ff3d44543348387e64771c227f7eb15089 100644 (file)
--- a/vp8/encoder/encodeintra.c
+++ b/vp8/encoder/encodeintra.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/common/idct.h"
 #include "quantize.h"
 #include "vp8/common/reconintra.h"

diff --git a/vp8/encoder/encodemb.c b/vp8/encoder/encodemb.c
index 50985be0647d6514956ea7f32ef520acfabb78f3..ff9e3e6ee6fffd9856da28ee8864d7d6d11841dd 100644 (file)
--- a/vp8/encoder/encodemb.c
+++ b/vp8/encoder/encodemb.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "encodemb.h"
 #include "vp8/common/reconinter.h"
 #include "quantize.h"

diff --git a/vp8/encoder/encodemb.h b/vp8/encoder/encodemb.h
index f2cf00b4e535ee1516acb02dd6fb97fc51f50a66..8fa457aa8131039a31f1d32e9fbea501b86052eb 100644 (file)
--- a/vp8/encoder/encodemb.h
+++ b/vp8/encoder/encodemb.h
@@ -12,7 +12,7 @@
 #ifndef __INC_ENCODEMB_H
 #define __INC_ENCODEMB_H
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "block.h"
 
 #define prototype_mberr(sym) \

diff --git a/vp8/encoder/generic/csystemdependent.c b/vp8/encoder/generic/csystemdependent.c
index a14843a8095415923601da7edfbbbd0d919b9959..28526f3223ca2b9e4efcde8ed4011d07598af565 100644 (file)
--- a/vp8/encoder/generic/csystemdependent.c
+++ b/vp8/encoder/generic/csystemdependent.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/encoder/variance.h"
 #include "vp8/encoder/onyx_int.h"
 

diff --git a/vp8/encoder/mcomp.c b/vp8/encoder/mcomp.c
index aebcfce70cb8bebffbcf9c0d0f44654907c9527b..c1a0ea7bf8bb8db17c086b8539900ce98836a9fa 100644 (file)
--- a/vp8/encoder/mcomp.c
+++ b/vp8/encoder/mcomp.c
@@ -11,7 +11,7 @@
 
 #include "mcomp.h"
 #include "vpx_mem/vpx_mem.h"
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include <stdio.h>
 #include <limits.h>
 #include <math.h>

diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h
index aead2fbb7e6f5d7909008a601458f4884d14847e..968ebf83312bf431eea91db7cb38c9668ea13411 100644 (file)
--- a/vp8/encoder/onyx_int.h
+++ b/vp8/encoder/onyx_int.h
@@ -13,7 +13,7 @@
 #define __INC_VP8_INT_H
 
 #include <stdio.h>
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/common/onyx.h"
 #include "treewriter.h"
 #include "tokenize.h"

diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c
index bfac3fa8f6d2b11927ef0112503338c0ab5a53c5..34e08cad864e007de3d30855242bbdc4c40c3aeb 100644 (file)
--- a/vp8/encoder/pickinter.c
+++ b/vp8/encoder/pickinter.c
@@ -10,7 +10,7 @@
 
 
 #include <limits.h>
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "onyx_int.h"
 #include "modecosts.h"
 #include "encodeintra.h"

diff --git a/vp8/encoder/pickinter.h b/vp8/encoder/pickinter.h
index a0103d165d60a2cd194fe33d7c14a0681c1c43eb..1c5d6a6e6f6331ef5a9bf2c89121bf91783c0395 100644 (file)
--- a/vp8/encoder/pickinter.h
+++ b/vp8/encoder/pickinter.h
@@ -11,7 +11,7 @@
 
 #ifndef __INC_PICKINTER_H
 #define __INC_PICKINTER_H
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vp8/common/onyxc_int.h"
 
 extern void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int recon_uvoffset, int *returnrate, int *returndistortion, int *returnintra);

diff --git a/vp8/encoder/sad_c.c b/vp8/encoder/sad_c.c
index c734458a9d27ddade40d3fc643f51d48f523addd..3b6e26c4e9a9feb45ae6f903c960c18851f6546d 100644 (file)
--- a/vp8/encoder/sad_c.c
+++ b/vp8/encoder/sad_c.c
@@ -10,7 +10,7 @@
 
 
 #include <stdlib.h>
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx/vpx_integer.h"
 
 unsigned int vp8_sad16x16_c(

diff --git a/vp8/encoder/x86/x86_csystemdependent.c b/vp8/encoder/x86/x86_csystemdependent.c
index 36b7b7194587c0d45cd3bb69137c56a5c0cde10a..191d61c60c8e11e513cce54acc5fb8b1cb8ac94a 100644 (file)
--- a/vp8/encoder/x86/x86_csystemdependent.c
+++ b/vp8/encoder/x86/x86_csystemdependent.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx_ports/x86.h"
 #include "vp8/encoder/variance.h"
 #include "vp8/encoder/onyx_int.h"

diff --git a/vpx_mem/include/vpx_mem_intrnl.h b/vpx_mem/include/vpx_mem_intrnl.h
index 6e261ba7f0010bbbab551005b7781b5316c249e0..63c6b777c4c205b061ebf07de153c21757b9883d 100644 (file)
--- a/vpx_mem/include/vpx_mem_intrnl.h
+++ b/vpx_mem/include/vpx_mem_intrnl.h
@@ -11,7 +11,7 @@
 
 #ifndef __VPX_MEM_INTRNL_H__
 #define __VPX_MEM_INTRNL_H__
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 
 #ifndef CONFIG_MEM_MANAGER
 # if defined(VXWORKS)

diff --git a/vpx_mem/vpx_mem_tracker.c b/vpx_mem/vpx_mem_tracker.c
index 9e8623a9a30d2363eb0cd386e2fe778a62c4910e..b37076ec89a221beb9557e1b5840f935093f5485 100644 (file)
--- a/vpx_mem/vpx_mem_tracker.c
+++ b/vpx_mem/vpx_mem_tracker.c
@@ -22,7 +22,7 @@
    in the memory_tracker struct as well as calls to create/destroy/lock/unlock
    the mutex in vpx_memory_tracker_init/Destroy and memory_tracker_lock_mutex/unlock_mutex
 */
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 
 #if defined(__uClinux__)
 # include <lddk.h>

diff --git a/vpx_ports/arm.h b/vpx_ports/arm.h
index 81af1f11ffecd8f8832258fa2fc2751ccf736286..525a7641f2f7409fb7baa065eeea0fd2c654ea76 100644 (file)
--- a/vpx_ports/arm.h
+++ b/vpx_ports/arm.h
@@ -12,7 +12,7 @@
 #ifndef VPX_PORTS_ARM_H
 #define VPX_PORTS_ARM_H
 #include <stdlib.h>
-#include "config.h"
+#include "vpx_config.h"
 
 /*ARMv5TE "Enhanced DSP" instructions.*/
 #define HAS_EDSP  0x01

diff --git a/vpx_ports/config.h b/vpx_ports/config.h
deleted file mode 100644 (file)
index 1abe70d..0000000
--- a/vpx_ports/config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- *  Copyright (c) 2010 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.
- */
-#include "vpx_config.h"

diff --git a/vpx_ports/mem_ops_aligned.h b/vpx_ports/mem_ops_aligned.h
index 82a18b2e0c394d5308f98909fd1c27b874688d69..0fbba65e22528ade9a89df3946bf8249d59a3bf2 100644 (file)
--- a/vpx_ports/mem_ops_aligned.h
+++ b/vpx_ports/mem_ops_aligned.h
@@ -80,7 +80,7 @@
         *mem = (uint##sz##_t)raw;\
     }
 
-#include "config.h"
+#include "vpx_config.h"
 #if CONFIG_BIG_ENDIAN
 #define mem_get_be_aligned_generic(sz)  mem_get_ne_aligned_generic(be,sz)
 #define mem_get_sbe_aligned_generic(sz) mem_get_sne_aligned_generic(be,sz)

diff --git a/vpx_ports/vpxtypes.h b/vpx_ports/vpxtypes.h
index 2ab66b14b7d66f79f8f6511f0d303af5adf4e709..c7ccc0510554f992e287a9b27f1b2f640d7c451d 100644 (file)
--- a/vpx_ports/vpxtypes.h
+++ b/vpx_ports/vpxtypes.h
@@ -12,7 +12,7 @@
 #ifndef __VPXTYPES_H__
 #define __VPXTYPES_H__
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 
 //#include <sys/types.h>
 #ifdef _MSC_VER

diff --git a/vpx_ports/x86.h b/vpx_ports/x86.h
index b0130fbfe602aaf590dda71b107f3c736337efed..1f3d5ebe113c3d2f5165557eb2d8ce4a47690bc7 100644 (file)
--- a/vpx_ports/x86.h
+++ b/vpx_ports/x86.h
@@ -12,7 +12,7 @@
 #ifndef VPX_PORTS_X86_H
 #define VPX_PORTS_X86_H
 #include <stdlib.h>
-#include "config.h"
+#include "vpx_config.h"
 
 typedef enum
 {

diff --git a/vpx_scale/arm/scalesystemdependent.c b/vpx_scale/arm/scalesystemdependent.c
index fee76fff78c0acb6539be0989762cbea0d33b535..cdfc23efd94118347ee190eab3e889dac56465ad 100644 (file)
--- a/vpx_scale/arm/scalesystemdependent.c
+++ b/vpx_scale/arm/scalesystemdependent.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx_ports/arm.h"
 #include "vpx_scale/vpxscale.h"
 

diff --git a/vpx_scale/generic/scalesystemdependent.c b/vpx_scale/generic/scalesystemdependent.c
index 926feb7cd14fbb4a3f603c8f02b06612283fdc16..54217157b14c8cf5bc7b5f1e153e02f6e16eda4a 100644 (file)
--- a/vpx_scale/generic/scalesystemdependent.c
+++ b/vpx_scale/generic/scalesystemdependent.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "vpx_ports/config.h"
+#include "vpx_config.h"
 #include "vpx_scale/vpxscale.h"