Merge commit '84c0ece5fd9569c0f31804f02a199ecd0e7d13d8'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 11:01:47 +0000 (12:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 11:01:47 +0000 (12:01 +0100)
* commit '84c0ece5fd9569c0f31804f02a199ecd0e7d13d8':
  hevc: further reduce code duplication in hls_prediction_unit()

Conflicts:
libavcodec/hevc.c

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

@@@ -1666,16 -1706,16 +1660,16 @@@ static void hls_prediction_unit(HEVCCon
              current_mv.mv[1].x += lc->pu.mvd.x;
              current_mv.mv[1].y += lc->pu.mvd.y;
          }
+     }
  
-         x_pu = x0 >> s->sps->log2_min_pu_size;
-         y_pu = y0 >> s->sps->log2_min_pu_size;
+     x_pu = x0 >> s->sps->log2_min_pu_size;
+     y_pu = y0 >> s->sps->log2_min_pu_size;
  
-         for(j = 0; j < nPbH >> s->sps->log2_min_pu_size; j++)
-             for (i = 0; i < nPbW >> s->sps->log2_min_pu_size; i++)
-                 tab_mvf[(y_pu + j) * min_pu_width + x_pu + i] = current_mv;
-     }
+     for (j = 0; j < nPbH >> s->sps->log2_min_pu_size; j++)
+         for (i = 0; i < nPbW >> s->sps->log2_min_pu_size; i++)
+             tab_mvf[(y_pu + j) * min_pu_width + x_pu + i] = current_mv;
  
 -    if (current_mv.pred_flag[0]) {
 +    if (current_mv.pred_flag & PF_L0) {
          ref0 = refPicList[0].ref[current_mv.ref_idx[0]];
          if (!ref0)
              return;