Cosmetics

diff --git a/common/macroblock.h b/common/macroblock.h
index 8d872f188e5d5671976e5b1520421d4bc62f5c69..44d9b0256f5f9614bbed64a337194bb61134d917 100644 (file)
--- a/common/macroblock.h
+++ b/common/macroblock.h
@@ -461,4 +461,3 @@ static ALWAYS_INLINE int x264_mb_transform_8x8_allowed( x264_t *h )
 }
 
 #endif
-

diff --git a/common/mips/pixel.h b/common/mips/pixel.h
index 7d4a282e1f4242efd125bd0a510537cdb77ecef8..a37bcb71ed6b9961051ca335d42a6beef46aefcb 100644 (file)
--- a/common/mips/pixel.h
+++ b/common/mips/pixel.h
@@ -23,8 +23,8 @@
  * For more information, contact us at licensing@x264.com.
  *****************************************************************************/
 
-#ifndef X264_MIPS_SAD_H
-#define X264_MIPS_SAD_H
+#ifndef X264_MIPS_PIXEL_H
+#define X264_MIPS_PIXEL_H
 
 #define x264_pixel_sad_16x16_msa x264_template(pixel_sad_16x16_msa)
 int32_t x264_pixel_sad_16x16_msa( uint8_t *p_src, intptr_t i_src_stride,

diff --git a/common/x86/dct.h b/common/x86/dct.h
index a90a374de7207478e15ca6ef3f2274db17625aef..e667d57566de1e1234665d7839ee39d4057e55ad 100644 (file)
--- a/common/x86/dct.h
+++ b/common/x86/dct.h
@@ -25,8 +25,8 @@
  * For more information, contact us at licensing@x264.com.
  *****************************************************************************/
 
-#ifndef X264_I386_DCT_H
-#define X264_I386_DCT_H
+#ifndef X264_X86_DCT_H
+#define X264_X86_DCT_H
 
 #define x264_sub4x4_dct_mmx x264_template(sub4x4_dct_mmx)
 void x264_sub4x4_dct_mmx    ( dctcoef dct    [16], pixel   *pix1, pixel   *pix2 );

diff --git a/common/x86/mc-c.c b/common/x86/mc-c.c
index bf697cfc938daf5789c89163ff3609d2db587f31..fd3e4df11cce35e758d31e65ec5f189e77a3b8eb 100644 (file)
--- a/common/x86/mc-c.c
+++ b/common/x86/mc-c.c
@@ -78,6 +78,7 @@ DECL_SUF( x264_pixel_avg_4x16,  ( pixel *, intptr_t, pixel *, intptr_t, pixel *,
 DECL_SUF( x264_pixel_avg_4x8,   ( pixel *, intptr_t, pixel *, intptr_t, pixel *, intptr_t, int ))
 DECL_SUF( x264_pixel_avg_4x4,   ( pixel *, intptr_t, pixel *, intptr_t, pixel *, intptr_t, int ))
 DECL_SUF( x264_pixel_avg_4x2,   ( pixel *, intptr_t, pixel *, intptr_t, pixel *, intptr_t, int ))
+#undef DECL_SUF
 
 #define x264_mc_weight_w12_mmx2 x264_template(mc_weight_w12_mmx2)
 #define x264_mc_weight_w12_sse2 x264_template(mc_weight_w12_sse2)
@@ -139,7 +140,7 @@ MC_WEIGHT( 20, ssse3 )
 MC_WEIGHT( 8, avx2 )
 MC_WEIGHT( 16, avx2 )
 MC_WEIGHT( 20, avx2 )
-#undef MC_OFFSET
+#undef MC_WEIGHT_OFFSET
 #undef MC_WEIGHT
 
 #define x264_mc_copy_w4_mmx x264_template(mc_copy_w4_mmx)
@@ -336,6 +337,7 @@ MC_CHROMA(ssse3)
 MC_CHROMA(cache64_ssse3)
 MC_CHROMA(avx)
 MC_CHROMA(avx2)
+#undef MC_CHROMA
 
 #define x264_frame_init_lowres_core_avx x264_template(frame_init_lowres_core_avx)
 #define x264_frame_init_lowres_core_avx2 x264_template(frame_init_lowres_core_avx2)
@@ -354,6 +356,7 @@ LOWRES(ssse3)
 LOWRES(avx)
 LOWRES(xop)
 LOWRES(avx2)
+#undef LOWRES
 
 #define x264_pixel_avg2_w10_mmx2 x264_template(pixel_avg2_w10_mmx2)
 #define x264_pixel_avg2_w10_sse2 x264_template(pixel_avg2_w10_sse2)
@@ -394,6 +397,8 @@ PIXEL_AVG_WALL(cache64_sse2)
 PIXEL_AVG_WALL(sse2)
 PIXEL_AVG_WALL(cache64_ssse3)
 PIXEL_AVG_WALL(avx2)
+#undef PIXEL_AVG_W
+#undef PIXEL_AVG_WALL
 
 #define PIXEL_AVG_WTAB(instr, name1, name2, name3, name4, name5)\
 static void (* const pixel_avg_wtab_##instr[6])( pixel *, intptr_t, pixel *, intptr_t, pixel *, intptr_t ) =\

diff --git a/common/x86/mc.h b/common/x86/mc.h
index b4e6d1a066784298239ac0127e70fc5987bfbb71..49fe1872c580eae63f87afea00677be6dba7ed72 100644 (file)
--- a/common/x86/mc.h
+++ b/common/x86/mc.h
@@ -24,8 +24,8 @@
  * For more information, contact us at licensing@x264.com.
  *****************************************************************************/
 
-#ifndef X264_I386_MC_H
-#define X264_I386_MC_H
+#ifndef X264_X86_MC_H
+#define X264_X86_MC_H
 
 #define x264_mc_init_mmx x264_template(mc_init_mmx)
 void x264_mc_init_mmx( int cpu, x264_mc_functions_t *pf );

diff --git a/common/x86/pixel.h b/common/x86/pixel.h
index 949785f15a1ca592367c7f7ea95ae3e5003b8f40..488a36a22394b08aaaf1363020c7ddcfb9eed25f 100644 (file)
--- a/common/x86/pixel.h
+++ b/common/x86/pixel.h
@@ -25,8 +25,8 @@
  * For more information, contact us at licensing@x264.com.
  *****************************************************************************/
 
-#ifndef X264_I386_PIXEL_H
-#define X264_I386_PIXEL_H
+#ifndef X264_X86_PIXEL_H
+#define X264_X86_PIXEL_H
 
 #define x264_pixel_ads1_avx x264_template(pixel_ads1_avx)
 #define x264_pixel_ads1_avx2 x264_template(pixel_ads1_avx2)

diff --git a/common/x86/predict.h b/common/x86/predict.h
index ca9699762e1c96826771f6c30b84579934d55d56..3c7bdaf025889898251fd219bed0175dbe13e0ef 100644 (file)
--- a/common/x86/predict.h
+++ b/common/x86/predict.h
@@ -24,8 +24,8 @@
  * For more information, contact us at licensing@x264.com.
  *****************************************************************************/
 
-#ifndef X264_I386_PREDICT_H
-#define X264_I386_PREDICT_H
+#ifndef X264_X86_PREDICT_H
+#define X264_X86_PREDICT_H
 
 #define x264_predict_16x16_init_mmx x264_template(predict_16x16_init_mmx)
 void x264_predict_16x16_init_mmx( int cpu, x264_predict_t pf[7] );

diff --git a/common/x86/quant.h b/common/x86/quant.h
index a37f71712f25d28b6b2ea77a411cfda792fd3e38..c15b0cf5fd601a6b893443eab5125e5a75230caf 100644 (file)
--- a/common/x86/quant.h
+++ b/common/x86/quant.h
@@ -25,8 +25,8 @@
  * For more information, contact us at licensing@x264.com.
  *****************************************************************************/
 
-#ifndef X264_I386_QUANT_H
-#define X264_I386_QUANT_H
+#ifndef X264_X86_QUANT_H
+#define X264_X86_QUANT_H
 
 #define x264_quant_2x2_dc_mmx2 x264_template(quant_2x2_dc_mmx2)
 int x264_quant_2x2_dc_mmx2( dctcoef dct[4], int mf, int bias );

diff --git a/encoder/analyse.h b/encoder/analyse.h
index 2dad00e89e697e5e7976332f54c5b94307bfba34..ceafa2df52b8d1686d224b0a7839d4c175128711 100644 (file)
--- a/encoder/analyse.h
+++ b/encoder/analyse.h
@@ -24,8 +24,8 @@
  * For more information, contact us at licensing@x264.com.
  *****************************************************************************/
 
-#ifndef X264_ANALYSE_H
-#define X264_ANALYSE_H
+#ifndef X264_ENCODER_ANALYSE_H
+#define X264_ENCODER_ANALYSE_H
 
 #define x264_analyse_init_costs x264_template(analyse_init_costs)
 int x264_analyse_init_costs( x264_t *h );

diff --git a/encoder/macroblock.h b/encoder/macroblock.h
index 16febe155bfc7ab625b3bf72a2e0cf5f362e4825..4ba22c60dd6e17bcb32cfa0a858ce4ecaefa7f1f 100644 (file)
--- a/encoder/macroblock.h
+++ b/encoder/macroblock.h
@@ -213,4 +213,3 @@ static ALWAYS_INLINE void x264_mb_encode_i8x8( x264_t *h, int p, int idx, int i_
 }
 
 #endif
-

diff --git a/encoder/me.h b/encoder/me.h
index 277291caf9ad021b22e9ebecf4bed38080bb3356..cf94d06ae0f488bd4e9dee1e9194bb7b0311fe15 100644 (file)
--- a/encoder/me.h
+++ b/encoder/me.h
@@ -24,8 +24,8 @@
  * For more information, contact us at licensing@x264.com.
  *****************************************************************************/
 
-#ifndef X264_ME_H
-#define X264_ME_H
+#ifndef X264_ENCODER_ME_H
+#define X264_ENCODER_ME_H
 
 #define COST_MAX (1<<28)
 #define COST_MAX64 (1ULL<<60)

diff --git a/encoder/ratecontrol.h b/encoder/ratecontrol.h
index e2415082f1aca4f077ea6ae11568ca234c8a04ec..c43d1a07c3e0bbf48890362b505097224450693c 100644 (file)
--- a/encoder/ratecontrol.h
+++ b/encoder/ratecontrol.h
@@ -24,8 +24,8 @@
  * For more information, contact us at licensing@x264.com.
  *****************************************************************************/
 
-#ifndef X264_RATECONTROL_H
-#define X264_RATECONTROL_H
+#ifndef X264_ENCODER_RATECONTROL_H
+#define X264_ENCODER_RATECONTROL_H
 
 /* Completely arbitrary.  Ratecontrol lowers relative quality at higher framerates
  * and the reverse at lower framerates; this serves as the center of the curve.
@@ -85,4 +85,3 @@ void x264_threads_merge_ratecontrol( x264_t *h );
 void x264_hrd_fullness( x264_t *h );
 
 #endif
-

diff --git a/encoder/set.c b/encoder/set.c
index a19fd4e5fffb744388fcad09e94b6e72e7bb1466..b381ee205764406eea8589de312044727b5b8997 100644 (file)
--- a/encoder/set.c
+++ b/encoder/set.c
@@ -31,7 +31,7 @@
 
 // Indexed by pic_struct values
 static const uint8_t num_clock_ts[10] = { 0, 1, 1, 1, 2, 2, 3, 3, 2, 3 };
-const static uint8_t avcintra_uuid[] = {0xF7, 0x49, 0x3E, 0xB3, 0xD4, 0x00, 0x47, 0x96, 0x86, 0x86, 0xC9, 0x70, 0x7B, 0x64, 0x37, 0x2A};
+static const uint8_t avcintra_uuid[] = {0xF7, 0x49, 0x3E, 0xB3, 0xD4, 0x00, 0x47, 0x96, 0x86, 0x86, 0xC9, 0x70, 0x7B, 0x64, 0x37, 0x2A};
 
 static void transpose( uint8_t *buf, int w )
 {