Add vp9_ prefix to init_macroblockd Change-Id: I202d4924e627eec94838741df004ed9259d38b88
diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index bab88bc..8f1240a 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h
@@ -348,7 +348,7 @@ (const vp9_prob (*)[PARTITION_TYPES - 1])cm->fc->partition_prob; } -static INLINE void init_macroblockd(VP9_COMMON *cm, MACROBLOCKD *xd) { +static INLINE void vp9_init_macroblockd(VP9_COMMON *cm, MACROBLOCKD *xd) { int i; for (i = 0; i < MAX_MB_PLANE; ++i) {
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 6ddfcbb..7631e4d 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c
@@ -1324,7 +1324,7 @@ setup_token_decoder(buf->data, data_end, buf->size, &cm->error, &tile_data->bit_reader, pbi->decrypt_cb, pbi->decrypt_state); - init_macroblockd(cm, &tile_data->xd); + vp9_init_macroblockd(cm, &tile_data->xd); } } @@ -1544,7 +1544,7 @@ setup_token_decoder(buf->data, data_end, buf->size, &cm->error, &tile_data->bit_reader, pbi->decrypt_cb, pbi->decrypt_state); - init_macroblockd(cm, &tile_data->xd); + vp9_init_macroblockd(cm, &tile_data->xd); worker->had_error = 0; if (i == num_workers - 1 || n == tile_cols - 1) {
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 256e1c2..721cd81 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c
@@ -732,7 +732,7 @@ vp9_set_mb_mi(cm, cm->width, cm->height); vp9_init_context_buffers(cm); - init_macroblockd(cm, xd); + vp9_init_macroblockd(cm, xd); cpi->td.mb.mbmi_ext_base = cpi->mbmi_ext_base; memset(cpi->mbmi_ext_base, 0, cm->mi_rows * cm->mi_cols * sizeof(*cpi->mbmi_ext_base));