Merge commit '16c01fb4347312b6d29a6498dad627665b96a20e'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 10:30:41 +0000 (11:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 10:30:41 +0000 (11:30 +0100)
* commit '16c01fb4347312b6d29a6498dad627665b96a20e':
  hevc: remove an unused function parameter

Conflicts:
libavcodec/hevc.c

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

@@@ -865,12 -1233,9 +865,11 @@@ static int hls_cross_component_pred(HEV
  static int hls_transform_unit(HEVCContext *s, int x0, int y0,
                                int xBase, int yBase, int cb_xBase, int cb_yBase,
                                int log2_cb_size, int log2_trafo_size,
-                               int trafo_depth, int blk_idx,
-                               int cbf_luma, int *cbf_cb, int *cbf_cr)
 -                              int blk_idx, int cbf_luma, int cbf_cb, int cbf_cr)
++                              int blk_idx, int cbf_luma, int *cbf_cb, int *cbf_cr)
  {
 -    HEVCLocalContext *lc = &s->HEVClc;
 +    HEVCLocalContext *lc = s->HEVClc;
 +    const int log2_trafo_size_c = log2_trafo_size - s->sps->hshift[1];
 +    int i;
  
      if (lc->cu.pred_mode == MODE_INTRA) {
          int trafo_size = 1 << log2_trafo_size;
@@@ -1177,13 -1400,11 +1176,13 @@@ do 
          int cbf_luma         = 1;
  
          if (lc->cu.pred_mode == MODE_INTRA || trafo_depth != 0 ||
 -            cbf_cb || cbf_cr)
 +            cbf_cb[0] || cbf_cr[0] ||
 +            (s->sps->chroma_format_idc == 2 && (cbf_cb[1] || cbf_cr[1]))) {
              cbf_luma = ff_hevc_cbf_luma_decode(s, trafo_depth);
 +        }
  
          ret = hls_transform_unit(s, x0, y0, xBase, yBase, cb_xBase, cb_yBase,
-                                  log2_cb_size, log2_trafo_size, trafo_depth,
+                                  log2_cb_size, log2_trafo_size,
                                   blk_idx, cbf_luma, cbf_cb, cbf_cr);
          if (ret < 0)
              return ret;