remove a useless bit of me=umh (originally copied from JM, where it was used for...

[x264] / encoder / macroblock.h

diff --git a/encoder/macroblock.h b/encoder/macroblock.h
index 3c848bcb7b6c8d3fbc26b76d66f8734db77eeeb3..d52668c6a4b6081b52049bd380d114d14a2325c9 100644 (file)
--- a/encoder/macroblock.h
+++ b/encoder/macroblock.h
@@ -39,6 +39,11 @@ void x264_macroblock_encode      ( x264_t *h );
 void x264_macroblock_write_cabac ( x264_t *h, x264_cabac_t *cb );
 void x264_macroblock_write_cavlc ( x264_t *h, bs_t *s );
 
+void x264_macroblock_encode_p8x8( x264_t *h, int i8 );
+void x264_mb_encode_i4x4( x264_t *h, int idx, int i_qscale );
+void x264_mb_encode_i8x8( x264_t *h, int idx, int i_qscale );
+void x264_mb_encode_8x8_chroma( x264_t *h, int b_inter, int i_qscale );
+
 void x264_cabac_mb_skip( x264_t *h, int b_skip );
 
 void x264_quant_4x4_trellis( x264_t *h, int16_t dct[4][4], int i_quant_cat,
@@ -46,11 +51,17 @@ void x264_quant_4x4_trellis( x264_t *h, int16_t dct[4][4], int i_quant_cat,
 void x264_quant_8x8_trellis( x264_t *h, int16_t dct[8][8], int i_quant_cat,
                              int i_qp, int b_intra );
 
-static inline int array_non_zero( int *v, int i_count )
+void x264_noise_reduction_update( x264_t *h );
+void x264_denoise_dct( x264_t *h, int16_t *dct );
+
+#define array_non_zero(a) array_non_zero_int(a, sizeof(a))
+static inline int array_non_zero_int( void *v, int i_count )
 {
     int i;
+    uint32_t *x = v;
+    i_count /= sizeof(uint32_t);
     for( i = 0; i < i_count; i++ )
-        if( v[i] ) return 1;
+        if( x[i] ) return 1;
     return 0;
 }