Merge "Remove extra line."
This commit is contained in:
@@ -24,10 +24,7 @@ static void find_mv_refs_idx(const VP9_COMMON *cm, const MACROBLOCKD *xd,
|
|||||||
? cm->prev_mi[mi_row * xd->mi_stride + mi_col].src_mi
|
? cm->prev_mi[mi_row * xd->mi_stride + mi_col].src_mi
|
||||||
: NULL;
|
: NULL;
|
||||||
const MB_MODE_INFO *const prev_mbmi = prev_mi ? &prev_mi->src_mi->mbmi : NULL;
|
const MB_MODE_INFO *const prev_mbmi = prev_mi ? &prev_mi->src_mi->mbmi : NULL;
|
||||||
|
|
||||||
|
|
||||||
const POSITION *const mv_ref_search = mv_ref_blocks[mi->mbmi.sb_type];
|
const POSITION *const mv_ref_search = mv_ref_blocks[mi->mbmi.sb_type];
|
||||||
|
|
||||||
int different_ref_found = 0;
|
int different_ref_found = 0;
|
||||||
int context_counter = 0;
|
int context_counter = 0;
|
||||||
|
|
||||||
@@ -127,7 +124,6 @@ static void lower_mv_precision(MV *mv, int allow_hp) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void vp9_find_best_ref_mvs(MACROBLOCKD *xd, int allow_hp,
|
void vp9_find_best_ref_mvs(MACROBLOCKD *xd, int allow_hp,
|
||||||
int_mv *mvlist, int_mv *nearest, int_mv *near) {
|
int_mv *mvlist, int_mv *nearest, int_mv *near) {
|
||||||
int i;
|
int i;
|
||||||
|
|||||||
@@ -223,7 +223,6 @@ static int read_mv_component(vp9_reader *r,
|
|||||||
fr = vp9_read_tree(r, vp9_mv_fp_tree, class0 ? mvcomp->class0_fp[d]
|
fr = vp9_read_tree(r, vp9_mv_fp_tree, class0 ? mvcomp->class0_fp[d]
|
||||||
: mvcomp->fp);
|
: mvcomp->fp);
|
||||||
|
|
||||||
|
|
||||||
// High precision part (if hp is not used, the default value of the hp is 1)
|
// High precision part (if hp is not used, the default value of the hp is 1)
|
||||||
hp = usehp ? vp9_read(r, class0 ? mvcomp->class0_hp : mvcomp->hp)
|
hp = usehp ? vp9_read(r, class0 ? mvcomp->class0_hp : mvcomp->hp)
|
||||||
: 1;
|
: 1;
|
||||||
|
|||||||
Reference in New Issue
Block a user