diff options
Diffstat (limited to 'vp8/common/blockd.h')
| -rw-r--r-- | vp8/common/blockd.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h index cb546e74b..5d919f1a9 100644 --- a/vp8/common/blockd.h +++ b/vp8/common/blockd.h @@ -216,10 +216,8 @@ typedef struct { MV_REFERENCE_FRAME ref_frame, second_ref_frame; TX_SIZE txfm_size; int_mv mv[2]; // for each reference frame used -#if CONFIG_NEWBESTREFMV - int_mv ref_mv, second_ref_mv; +#if CONFIG_NEWBESTREFMV || CONFIG_NEW_MVREF int_mv ref_mvs[MAX_REF_FRAMES][MAX_MV_REFS]; - int mv_ref_index[MAX_REF_FRAMES]; #endif SPLITMV_PARTITIONING_TYPE partitioning; @@ -325,6 +323,9 @@ typedef struct MacroBlockD { // Probability Tree used to code Segment number vp8_prob mb_segment_tree_probs[MB_FEATURE_TREE_PROBS]; +#if CONFIG_NEW_MVREF + vp8_prob mb_mv_ref_id_probs[MAX_REF_FRAMES][3]; +#endif // Segment features signed char segment_feature_data[MAX_MB_SEGMENTS][SEG_LVL_MAX]; @@ -379,11 +380,6 @@ typedef struct MacroBlockD { #endif int mb_index; // Index of the MB in the SB (0..3) - -#if CONFIG_NEWBESTREFMV - int_mv ref_mv[MAX_MV_REFS]; -#endif - int q_index; } MACROBLOCKD; |