From 0499e06f2f4b283abdf2a0787c7acc941c903f32 Mon Sep 17 00:00:00 2001 From: Scott LaVarnway Date: Fri, 19 Feb 2016 05:34:12 -0800 Subject: [PATCH] VP9: rename vpx_read_mode_info to vp9_read_mode_info Change-Id: I3cb3da864e33012ba68d61ee8bafa8c42f00313c --- vp9/decoder/vp9_decodeframe.c | 2 +- vp9/decoder/vp9_decodemv.c | 2 +- vp9/decoder/vp9_decodemv.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 9ce137d04..7fc573333 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -859,7 +859,7 @@ static void decode_block(VP9Decoder *const pbi, MACROBLOCKD *const xd, VPX_CODEC_CORRUPT_FRAME, "Invalid block size."); } - vpx_read_mode_info(pbi, xd, mi_row, mi_col, r, x_mis, y_mis); + vp9_read_mode_info(pbi, xd, mi_row, mi_col, r, x_mis, y_mis); if (mi->skip) { dec_reset_skip_context(xd); diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index 86044207c..577bcb864 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -860,7 +860,7 @@ static INLINE void copy_ref_frame_pair(MV_REFERENCE_FRAME *dst, memcpy(dst, src, sizeof(*dst) * 2); } -void vpx_read_mode_info(VP9Decoder *const pbi, MACROBLOCKD *xd, +void vp9_read_mode_info(VP9Decoder *const pbi, MACROBLOCKD *xd, int mi_row, int mi_col, vpx_reader *r, int x_mis, int y_mis) { VP9_COMMON *const cm = &pbi->common; diff --git a/vp9/decoder/vp9_decodemv.h b/vp9/decoder/vp9_decodemv.h index 75f568cf1..45569ec81 100644 --- a/vp9/decoder/vp9_decodemv.h +++ b/vp9/decoder/vp9_decodemv.h @@ -19,7 +19,7 @@ extern "C" { #endif -void vpx_read_mode_info(VP9Decoder *const pbi, MACROBLOCKD *xd, +void vp9_read_mode_info(VP9Decoder *const pbi, MACROBLOCKD *xd, int mi_row, int mi_col, vpx_reader *r, int x_mis, int y_mis);