diff options
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/common/vp9_onyxc_int.h | 2 | ||||
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 4 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index bab88bcdb..8f1240a6a 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -348,7 +348,7 @@ static INLINE void set_partition_probs(const VP9_COMMON *const cm, (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 6ddfcbb4b..7631e4d09 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -1324,7 +1324,7 @@ static const uint8_t *decode_tiles(VP9Decoder *pbi, 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 @@ static const uint8_t *decode_tiles_mt(VP9Decoder *pbi, 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 256e1c236..721cd81bf 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -732,7 +732,7 @@ static void update_frame_size(VP9_COMP *cpi) { 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)); |