commit 3e35686b4da7aea08322655adf50be5ad107abaa
author Hui Su <huisu@google.com> Mon Jun 10 17:06:59 2019 -0700
committer Hui Su <huisu@google.com> Tue Jun 11 12:17:46 2019 -0700
tree 1b69c79175d9ff1e62e25e6e053d608d929045c3
parent f235777f87e1351c7d91e8cc279499a4ccb96896

Localize a variable in get_this_mv()

Change-Id: I4bd95089ffe6669a9cdac8d7386f5095dee0e6ef

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index df909e3..3e9d3ae 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -9605,7 +9605,6 @@
                                int ref_idx, int ref_mv_idx,
                                const MV_REFERENCE_FRAME *ref_frame,
                                const MB_MODE_INFO_EXT *mbmi_ext) {
-  const uint8_t ref_frame_type = av1_ref_frame_type(ref_frame);
   const int is_comp_pred = ref_frame[1] > INTRA_FRAME;
   const PREDICTION_MODE single_mode =
       get_single_mode(this_mode, ref_idx, is_comp_pred);
@@ -9616,6 +9615,7 @@
     *this_mv = mbmi_ext->global_mvs[ref_frame[ref_idx]];
   } else {
     assert(single_mode == NEARMV || single_mode == NEARESTMV);
+    const uint8_t ref_frame_type = av1_ref_frame_type(ref_frame);
     const int ref_mv_offset = single_mode == NEARESTMV ? 0 : ref_mv_idx + 1;
     if (ref_mv_offset < mbmi_ext->ref_mv_count[ref_frame_type]) {
       assert(ref_mv_offset >= 0);