X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=common%2Fmacroblock.h;h=feb682e503cca3838fe0067738076dfc3f5165fe;hb=bee57e6df38792a01053a96cecc3ecd30a2df434;hp=7690e01bf840ecbdbf5021670e31b5869ff2bd82;hpb=b3dc88f65543b3f85661c71b7ffe96a6337b94f1;p=x264 diff --git a/common/macroblock.h b/common/macroblock.h index 7690e01b..feb682e5 100644 --- a/common/macroblock.h +++ b/common/macroblock.h @@ -1,7 +1,7 @@ /***************************************************************************** * macroblock.h: macroblock common functions ***************************************************************************** - * Copyright (C) 2005-2010 x264 project + * Copyright (C) 2005-2011 x264 project * * Authors: Loren Merritt * Laurent Aimar @@ -290,8 +290,10 @@ void x264_macroblock_thread_free( x264_t *h, int b_lookahead ); void x264_macroblock_slice_init( x264_t *h ); void x264_macroblock_thread_init( x264_t *h ); -void x264_macroblock_cache_load( x264_t *h, int mb_x, int mb_y ); -void x264_macroblock_cache_load_deblock( x264_t *h ); +void x264_macroblock_cache_load( x264_t *h, int mb_x, int mb_y, int b_interlaced ); +void x264_macroblock_cache_load_progressive( x264_t *h, int mb_x, int mb_y ); +void x264_macroblock_cache_load_interlaced( x264_t *h, int mb_x, int mb_y ); +void x264_macroblock_deblock_strength( x264_t *h ); void x264_macroblock_cache_load_neighbours_deblock( x264_t *h, int mb_x, int mb_y ); void x264_macroblock_cache_save( x264_t *h );