From 1a7d25a4848b2279c79a3a5a723d3e33ec003b24 Mon Sep 17 00:00:00 2001 From: Attila Nagy Date: Thu, 15 Sep 2011 15:34:12 +0300 Subject: [PATCH] Replace vpx_ports/config.h with vpx_config.h Just a clean-up. Change-Id: Iea5b6dc925dcfa7db548bc1ab1a13d26ed5a2c9a --- examples.mk | 4 ++-- vp8/common/alloccommon.c | 2 +- vp8/common/arm/arm_systemdependent.c | 2 +- vp8/common/arm/filter_arm.c | 2 +- vp8/common/arm/neon/recon_neon.c | 2 +- vp8/common/arm/reconintra_arm.c | 2 +- vp8/common/blockd.h | 2 +- vp8/common/generic/systemdependent.c | 2 +- vp8/common/invtrans.h | 2 +- vp8/common/postproc.c | 2 +- vp8/common/recon.c | 2 +- vp8/common/reconinter.c | 2 +- vp8/common/reconintra.c | 2 +- vp8/common/reconintra4x4.c | 2 +- vp8/common/systemdependent.h | 2 +- vp8/common/x86/recon_wrapper_sse2.c | 2 +- vp8/common/x86/vp8_asm_stubs.c | 2 +- vp8/decoder/arm/arm_dsystemdependent.c | 2 +- vp8/decoder/arm/armv6/idct_blk_v6.c | 2 +- vp8/decoder/arm/dequantize_arm.c | 2 +- vp8/decoder/arm/neon/idct_blk_neon.c | 2 +- vp8/decoder/dboolhuff.h | 2 +- vp8/decoder/dequantize.c | 2 +- vp8/decoder/generic/dsystemdependent.c | 2 +- vp8/decoder/idct_blk.c | 2 +- vp8/decoder/onyxd_int.h | 2 +- vp8/decoder/reconintra_mt.c | 2 +- vp8/decoder/x86/idct_blk_mmx.c | 2 +- vp8/decoder/x86/idct_blk_sse2.c | 2 +- vp8/decoder/x86/x86_dsystemdependent.c | 2 +- vp8/encoder/arm/arm_csystemdependent.c | 2 +- vp8/encoder/encodeframe.c | 2 +- vp8/encoder/encodeintra.c | 2 +- vp8/encoder/encodemb.c | 2 +- vp8/encoder/encodemb.h | 2 +- vp8/encoder/generic/csystemdependent.c | 2 +- vp8/encoder/mcomp.c | 2 +- vp8/encoder/onyx_int.h | 2 +- vp8/encoder/pickinter.c | 2 +- vp8/encoder/pickinter.h | 2 +- vp8/encoder/sad_c.c | 2 +- vp8/encoder/x86/x86_csystemdependent.c | 2 +- vpx_mem/include/vpx_mem_intrnl.h | 2 +- vpx_mem/vpx_mem_tracker.c | 2 +- vpx_ports/arm.h | 2 +- vpx_ports/config.h | 10 ---------- vpx_ports/mem_ops_aligned.h | 2 +- vpx_ports/vpxtypes.h | 2 +- vpx_ports/x86.h | 2 +- vpx_scale/arm/scalesystemdependent.c | 2 +- vpx_scale/generic/scalesystemdependent.c | 2 +- 51 files changed, 51 insertions(+), 61 deletions(-) delete mode 100644 vpx_ports/config.h diff --git a/examples.mk b/examples.mk index 4ebb035d9..b6bf882e5 100644 --- 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 d73231787..97a3559a4 100644 --- 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 c0467cd84..2b45afe4b 100644 --- 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 6582fb29a..6d95eb8e3 100644 --- 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 #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 09fd2a56f..d2aafd51f 100644 --- 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 f8f4dca3e..cd82baf7c 100644 --- 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 61c21d19f..6cb3fe1bb 100644 --- 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 c61629407..d1dd60286 100644 --- 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 b3ffb7073..d14573b91 100644 --- 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 14c3b7bf3..ace4c113c 100644 --- 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 d72d6e410..eebf6dcb9 100644 --- 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 064a8355c..b992440ae 100644 --- 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 9cf5f6a88..16dadc47d 100644 --- 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 18c514541..0e1ebb584 100644 --- 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 db996987a..f99c4bb2a 100644 --- 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 cb7b69c08..fcc75a901 100644 --- 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 790400609..bce7bc38e 100644 --- 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 6ce471217..1b0091cdb 100644 --- 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 57c344698..5c7592f35 100644 --- 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 98db6eeff..2918e0512 100644 --- 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 ee3500425..f31654060 100644 --- 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 853c10f14..880c18522 100644 --- a/vp8/decoder/dboolhuff.h +++ b/vp8/decoder/dboolhuff.h @@ -13,7 +13,7 @@ #define DBOOLHUFF_H #include #include -#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 dd0c13b7d..a60442fe8 100644 --- 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 2406deaaf..9c42bc62d 100644 --- 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 df0192354..04bce665e 100644 --- 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 4ece4312a..a84f16914 100644 --- 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 b9d2b3703..9bba5b75f 100644 --- 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 8f1a363cd..558dbaf7e 100644 --- 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 3a4806862..a6a720639 100644 --- 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 a244a3a98..443150483 100644 --- 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 89f8136fe..94250844c 100644 --- 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 19b52a3bf..510e4cc98 100644 --- 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 59db0253b..4a77c1ff3 100644 --- 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 50985be06..ff9e3e6ee 100644 --- 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 f2cf00b4e..8fa457aa8 100644 --- 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 a14843a80..28526f322 100644 --- 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 aebcfce70..c1a0ea7bf 100644 --- 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 #include #include diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h index aead2fbb7..968ebf833 100644 --- a/vp8/encoder/onyx_int.h +++ b/vp8/encoder/onyx_int.h @@ -13,7 +13,7 @@ #define __INC_VP8_INT_H #include -#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 bfac3fa8f..34e08cad8 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -10,7 +10,7 @@ #include -#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 a0103d165..1c5d6a6e6 100644 --- 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 c734458a9..3b6e26c4e 100644 --- a/vp8/encoder/sad_c.c +++ b/vp8/encoder/sad_c.c @@ -10,7 +10,7 @@ #include -#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 36b7b7194..191d61c60 100644 --- 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 6e261ba7f..63c6b777c 100644 --- 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 9e8623a9a..b37076ec8 100644 --- 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 diff --git a/vpx_ports/arm.h b/vpx_ports/arm.h index 81af1f11f..525a7641f 100644 --- 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 -#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 index 1abe70da9..000000000 --- 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 82a18b2e0..0fbba65e2 100644 --- 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 2ab66b14b..c7ccc0510 100644 --- 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 #ifdef _MSC_VER diff --git a/vpx_ports/x86.h b/vpx_ports/x86.h index b0130fbfe..1f3d5ebe1 100644 --- 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 -#include "config.h" +#include "vpx_config.h" typedef enum { diff --git a/vpx_scale/arm/scalesystemdependent.c b/vpx_scale/arm/scalesystemdependent.c index fee76fff7..cdfc23efd 100644 --- 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 926feb7cd..54217157b 100644 --- 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"