ref: 6ffa05901de549f9aad458c2b4c570468b8aff38
parent: 07fbd70e386cb31ff1cb9faea63502858125c7b9
parent: d8e556412971d9126d09bb5ceb4ba53e38bb9929
author: Dmitry Kovalev <[email protected]>
date: Thu Mar 13 13:47:14 EDT 2014
Merge "Using MB_PREDICTION_MODE enum instead of int."
--- a/vp9/common/vp9_reconintra.c
+++ b/vp9/common/vp9_reconintra.c
@@ -434,7 +434,7 @@
}
void vp9_predict_intra_block(const MACROBLOCKD *xd, int block_idx, int bwl_in,
- TX_SIZE tx_size, int mode,
+ TX_SIZE tx_size, MB_PREDICTION_MODE mode,
const uint8_t *ref, int ref_stride,
uint8_t *dst, int dst_stride,
int aoff, int loff, int plane) {
--- a/vp9/common/vp9_reconintra.h
+++ b/vp9/common/vp9_reconintra.h
@@ -19,7 +19,7 @@
#endif
void vp9_predict_intra_block(const MACROBLOCKD *xd, int block_idx, int bwl_in,
- TX_SIZE tx_size, int mode,
+ TX_SIZE tx_size, MB_PREDICTION_MODE mode,
const uint8_t *ref, int ref_stride,
uint8_t *dst, int dst_stride,
int aoff, int loff, int plane);