Commit 453224f1 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'e36a2f4c'

* commit 'e36a2f4c':
  hevc: eliminate an unnecessary array

Conflicts:
	libavcodec/hevc.c

See: 255086a7Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents c11255ae e36a2f4c
......@@ -2123,15 +2123,15 @@ static int hls_coding_quadtree(HEVCContext *s, int x0, int y0,
const int cb_size = 1 << log2_cb_size;
int ret;
int qp_block_mask = (1<<(s->sps->log2_ctb_size - s->pps->diff_cu_qp_delta_depth)) - 1;
int split_cu_flag;
int split_cu;
lc->ct.depth = cb_depth;
if (x0 + cb_size <= s->sps->width &&
y0 + cb_size <= s->sps->height &&
log2_cb_size > s->sps->log2_min_cb_size) {
split_cu_flag = ff_hevc_split_coding_unit_flag_decode(s, cb_depth, x0, y0);
split_cu = ff_hevc_split_coding_unit_flag_decode(s, cb_depth, x0, y0);
} else {
split_cu_flag = (log2_cb_size > s->sps->log2_min_cb_size);
split_cu = (log2_cb_size > s->sps->log2_min_cb_size);
}
if (s->pps->cu_qp_delta_enabled_flag &&
log2_cb_size >= s->sps->log2_ctb_size - s->pps->diff_cu_qp_delta_depth) {
......@@ -2144,7 +2144,7 @@ static int hls_coding_quadtree(HEVCContext *s, int x0, int y0,
lc->tu.is_cu_chroma_qp_offset_coded = 0;
}
if (split_cu_flag) {
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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment