shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Remove extra line."

--- a/vp9/common/vp9_mvref_common.c

+++ b/vp9/common/vp9_mvref_common.c

@@ -24,10 +24,7 @@

         ? cm->prev_mi[mi_row * xd->mi_stride + mi_col].src_mi

         : 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];

-

   int different_ref_found = 0;

   int context_counter = 0;

@@ -126,7 +123,6 @@

       mv->col += (mv->col > 0 ? -1 : 1);

   }

 }

-

 void vp9_find_best_ref_mvs(MACROBLOCKD *xd, int allow_hp,

                            int_mv *mvlist, int_mv *nearest, int_mv *near) {

--- a/vp9/decoder/vp9_decodemv.c

+++ b/vp9/decoder/vp9_decodemv.c

@@ -223,7 +223,6 @@

   fr = vp9_read_tree(r, vp9_mv_fp_tree, class0 ? mvcomp->class0_fp[d]

                                                : mvcomp->fp);

-

   // 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)

              : 1;