Merge commit 'e36a2f4c5280e2779b0e88974295a711cf8d88be'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jul 2014 10:53:17 +0000 (12:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jul 2014 10:54:14 +0000 (12:54 +0200)
* commit 'e36a2f4c5280e2779b0e88974295a711cf8d88be':
  hevc: eliminate an unnecessary array

Conflicts:
libavcodec/hevc.c

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

@@@ -2119,11 -2229,9 +2119,11 @@@ static int hls_coding_unit(HEVCContext 
  static int hls_coding_quadtree(HEVCContext *s, int x0, int y0,
                                 int log2_cb_size, int cb_depth)
  {
 -    HEVCLocalContext *lc = &s->HEVClc;
 +    HEVCLocalContext *lc = s->HEVClc;
      const int cb_size    = 1 << log2_cb_size;
-     int split_cu_flag;
 +    int ret;
 +    int qp_block_mask = (1<<(s->sps->log2_ctb_size - s->pps->diff_cu_qp_delta_depth)) - 1;
+     int split_cu;
  
      lc->ct.depth = cb_depth;
      if (x0 + cb_size <= s->sps->width  &&
          lc->tu.cu_qp_delta          = 0;
      }
  
-     if (split_cu_flag) {
 +    if (s->sh.cu_chroma_qp_offset_enabled_flag &&
 +        log2_cb_size >= s->sps->log2_ctb_size - s->pps->diff_cu_chroma_qp_offset_depth) {
 +        lc->tu.is_cu_chroma_qp_offset_coded = 0;
 +    }
 +
+     if (split_cu) {
          const int cb_size_split = cb_size >> 1;
          const int x1 = x0 + cb_size_split;
          const int y1 = y0 + cb_size_split;