diff options
| author | Mickaël Raulet <mraulet@insa-rennes.fr> | 2013-10-27 12:56:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-27 23:45:34 +0100 |
| commit | 3c3ece24ea1e6fdc8984234184bec18bc8f70750 (patch) | |
| tree | 2e8899c4bf25898f135d5c6c3e947538f517d63f /libavcodec/hevc_cabac.c | |
| parent | dbe6f9f2c2330e7c230ddd61af1cc2069af1cf04 (diff) | |
| download | ffmpeg-3c3ece24ea1e6fdc8984234184bec18bc8f70750.tar.gz | |
hevc : cosmetic changes(cherry picked from commit 7308c0ccf13f18cebe4851e6dcd6b5c0b09be1dd)
Decreases the difference to Anton Khirnovs patch v5
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc_cabac.c')
| -rw-r--r-- | libavcodec/hevc_cabac.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c index 2f6d0addde..937d75bb94 100644 --- a/libavcodec/hevc_cabac.c +++ b/libavcodec/hevc_cabac.c @@ -656,7 +656,7 @@ int ff_hevc_cu_transquant_bypass_flag_decode(HEVCContext *s) int ff_hevc_skip_flag_decode(HEVCContext *s, int x0, int y0, int x_cb, int y_cb) { - int pic_width_in_ctb = s->sps->width >> s->sps->log2_min_coding_block_size; + int min_cb_width = s->sps->width >> s->sps->log2_min_cb_size; int inc = 0; int x0b = x0 & ((1 << s->sps->log2_ctb_size) - 1); int y0b = y0 & ((1 << s->sps->log2_ctb_size) - 1); @@ -709,8 +709,8 @@ int ff_hevc_split_coding_unit_flag_decode(HEVCContext *s, int ct_depth, int x0, int inc = 0, depth_left = 0, depth_top = 0; int x0b = x0 & ((1 << s->sps->log2_ctb_size) - 1); int y0b = y0 & ((1 << s->sps->log2_ctb_size) - 1); - int x_cb = x0 >> s->sps->log2_min_coding_block_size; - int y_cb = y0 >> s->sps->log2_min_coding_block_size; + int x_cb = x0 >> s->sps->log2_min_cb_size; + int y_cb = y0 >> s->sps->log2_min_cb_size; if (s->HEVClc->ctb_left_flag || x0b) depth_left = s->tab_ct_depth[(y_cb)*s->sps->min_cb_width + x_cb-1]; @@ -726,7 +726,7 @@ int ff_hevc_part_mode_decode(HEVCContext *s, int log2_cb_size) { if (GET_CABAC(elem_offset[PART_MODE])) // 1 return PART_2Nx2N; - if (log2_cb_size == s->sps->log2_min_coding_block_size) { + if (log2_cb_size == s->sps->log2_min_cb_size) { if (s->HEVClc->cu.pred_mode == MODE_INTRA) // 0 return PART_NxN; if (GET_CABAC(elem_offset[PART_MODE] + 1)) // 01 |