cosmetics: move avg function ptrs from pixf to mc.

[x264] / encoder / macroblock.h

diff --git a/encoder/macroblock.h b/encoder/macroblock.h
index 6c8768aec07733d6861322786054a588f901e0ea..9f8f661cef6db77d9d529434f419357b304a0103 100644 (file)
--- a/encoder/macroblock.h
+++ b/encoder/macroblock.h
@@ -34,10 +34,31 @@ static inline int x264_macroblock_probe_bskip( x264_t *h )
     { return x264_macroblock_probe_skip( h, 1 ); }
 
 void x264_macroblock_encode      ( x264_t *h );
-void x264_macroblock_write_cabac ( x264_t *h, bs_t *s );
+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_cabac_mb_skip( x264_t *h, int b_skip );
 
+static inline int array_non_zero( int *v, int i_count )
+{
+    int i;
+    for( i = 0; i < i_count; i++ )
+        if( v[i] ) return 1;
+    return 0;
+}
+
+static inline int array_non_zero_count( int *v, int i_count )
+{
+    int i;
+    int i_nz;
+
+    for( i = 0, i_nz = 0; i < i_count; i++ )
+        if( v[i] )
+            i_nz++;
+
+    return i_nz;
+}
+
+
 #endif