shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Remove empty function vp9_build_block_offsets"

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -1549,8 +1549,6 @@

                    0, 0, NULL, NULL );

   setup_dst_planes(xd, &cm->yv12_fb[cm->new_fb_idx], 0, 0);

-  vp9_build_block_offsets(x);

-

   vp9_setup_block_dptrs(&x->e_mbd, cm->subsampling_x, cm->subsampling_y);

   xd->mode_info_context->mbmi.mode = DC_PRED;

@@ -2022,9 +2020,6 @@

     encode_frame_internal(cpi);

   }

-}

-

-void vp9_build_block_offsets(MACROBLOCK *x) {

 }

 static void sum_intra_stats(VP9_COMP *cpi, MACROBLOCK *x) {

--- a/vp9/encoder/vp9_encodeframe.h

+++ b/vp9/encoder/vp9_encodeframe.h

@@ -15,8 +15,6 @@

 struct macroblock;

 struct yv12_buffer_config;

-void vp9_build_block_offsets(struct macroblock *x);

-

 void vp9_setup_src_planes(struct macroblock *x,

                           const struct yv12_buffer_config *src,

                           int mb_row, int mb_col);

--- a/vp9/encoder/vp9_firstpass.c

+++ b/vp9/encoder/vp9_firstpass.c

@@ -521,8 +521,6 @@

   xd->mode_info_context = cm->mi;

-  vp9_build_block_offsets(x);

-

   vp9_setup_block_dptrs(&x->e_mbd, cm->subsampling_x, cm->subsampling_y);

   vp9_frame_init_quantizer(cpi);