Merge "Removing unused "ishp" arguments."

diff --cc vp9/decoder/vp9_decodemv.c
index bdd867d8c1141ab8e95c6863d28639185e1a3e08,e00a1863bcfd15cf7feffdb4e5f2b5ee4f78fa22..bddaacb6e395a02e3cc1916d4aeac837a12ba1b6
--- 1/vp9/decoder/vp9_decodemv.c
--- 2/vp9/decoder/vp9_decodemv.c
+++ b/vp9/decoder/vp9_decodemv.c
@@@ -507,10 -506,10 +508,10 @@@ static void read_inter_block_mode_info(
                                           &nearby_second, j, 1);
          }
  
 -        switch (blockmode) {
 +        switch (b_mode) {
            case NEWMV:
              read_mv(r, &blockmv.as_mv, &best_mv.as_mv, nmvc,
-                     &cm->counts.mv, xd->allow_high_precision_mv);
+                     &cm->counts.mv, allow_hp);
  
              if (ref1 > 0)
                read_mv(r, &secondmv.as_mv, &best_mv_second.as_mv, nmvc,

diff --cc vp9/encoder/vp9_bitstream.c
Simple merge