Merge "VP9: rename vpx_read_mode_info to vp9_read_mode_info"
This commit is contained in:
commit
6ccf854061
@ -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);
|
||||
|
@ -852,7 +852,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;
|
||||
|
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user