[x264-devel] Move cabac_block_residual function declarations

[Vittorio Giovara]

x264 | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Mon Jan 30 22:14:57 2017 +0100| [5840e200a0f1869a0596c5ed75c76f4d3221dd68] | committer: Henrik Gramner

Move cabac_block_residual function declarations

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=5840e200a0f1869a0596c5ed75c76f4d3221dd68
---

 encoder/macroblock.h | 3 +++
 tools/checkasm.c     | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/encoder/macroblock.h b/encoder/macroblock.h
index 0bf27112..f8688021 100644
--- a/encoder/macroblock.h
+++ b/encoder/macroblock.h
@@ -55,6 +55,9 @@ void x264_macroblock_encode_p4x4( x264_t *h, int i4 );
 void x264_mb_encode_chroma( x264_t *h, int b_inter, int i_qp );
 
 void x264_cabac_mb_skip( x264_t *h, int b_skip );
+void x264_cabac_block_residual_c( x264_t *h, x264_cabac_t *cb, int ctx_block_cat, dctcoef *l );
+void x264_cabac_block_residual_8x8_rd_c( x264_t *h, x264_cabac_t *cb, int ctx_block_cat, dctcoef *l );
+void x264_cabac_block_residual_rd_c( x264_t *h, x264_cabac_t *cb, int ctx_block_cat, dctcoef *l );
 
 int x264_quant_luma_dc_trellis( x264_t *h, dctcoef *dct, int i_quant_cat, int i_qp,
                                 int ctx_block_cat, int b_intra, int idx );
diff --git a/tools/checkasm.c b/tools/checkasm.c
index 3db44cf5..44d0896a 100644
--- a/tools/checkasm.c
+++ b/tools/checkasm.c
@@ -28,6 +28,7 @@
 #include <ctype.h>
 #include "common/common.h"
 #include "common/cpu.h"
+#include "encoder/macroblock.h"
 
 #ifdef _WIN32
 #include <windows.h>
@@ -2560,9 +2561,6 @@ DECL_CABAC(asm)
 #endif
 
 extern const uint8_t x264_count_cat_m1[14];
-void x264_cabac_block_residual_c( x264_t *h, x264_cabac_t *cb, int ctx_block_cat, dctcoef *l );
-void x264_cabac_block_residual_8x8_rd_c( x264_t *h, x264_cabac_t *cb, int ctx_block_cat, dctcoef *l );
-void x264_cabac_block_residual_rd_c( x264_t *h, x264_cabac_t *cb, int ctx_block_cat, dctcoef *l );
 
 static int check_cabac( int cpu_ref, int cpu_new )
 {