Merge commit 'eac3ac1fe0774b65316852616b2672702dbc3f31'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 11:12:55 +0000 (12:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 11:13:09 +0000 (12:13 +0100)
* commit 'eac3ac1fe0774b65316852616b2672702dbc3f31':
  hevc: eliminate an unneeded intermediate variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/hevc.c

@@@ -1627,11 -1673,10 +1626,10 @@@ static void hls_prediction_unit(HEVCCon
  
          if (inter_pred_idc != PRED_L1) {
              if (s->sh.nb_refs[L0]) {
-                 ref_idx[0] = ff_hevc_ref_idx_lx_decode(s, s->sh.nb_refs[L0]);
-                 current_mv.ref_idx[0] = ref_idx[0];
+                 current_mv.ref_idx[0]= ff_hevc_ref_idx_lx_decode(s, s->sh.nb_refs[L0]);
              }
 -            current_mv.pred_flag[0] = 1;
 -            hls_mvd_coding(s, x0, y0, 0);
 +            current_mv.pred_flag = PF_L0;
 +            ff_hevc_hls_mvd_coding(s, x0, y0, 0);
              mvp_flag = ff_hevc_mvp_lx_flag_decode(s);
              ff_hevc_luma_mv_mvp_mode(s, x0, y0, nPbW, nPbH, log2_cb_size,
                                       partIdx, merge_idx, &current_mv,