diff options
| author | Mickaël Raulet <mraulet@insa-rennes.fr> | 2013-10-27 13:29:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-27 23:46:54 +0100 |
| commit | 3106cbd32118b121b5ae3dbf1e586a41c2f0793f (patch) | |
| tree | c0b3602721af46d63e3e9ca67fa021a904101b60 /libavcodec/hevc_cabac.c | |
| parent | 3c3ece24ea1e6fdc8984234184bec18bc8f70750 (diff) | |
hevc: more cosmetic(cherry picked from commit 9697abe41daa234602915f85bf6b1c0ca0252cff)
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c index 937d75bb94..0fa7afa767 100644 --- a/libavcodec/hevc_cabac.c +++ b/libavcodec/hevc_cabac.c @@ -656,15 +656,15 @@ 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 min_cb_width = s->sps->width >> s->sps->log2_min_cb_size; + int min_cb_width = s->sps->min_cb_width; int inc = 0; int x0b = x0 & ((1 << s->sps->log2_ctb_size) - 1); int y0b = y0 & ((1 << s->sps->log2_ctb_size) - 1); if (s->HEVClc->ctb_left_flag || x0b) - inc = SAMPLE_CTB(s->skip_flag, x_cb-1, y_cb); + inc = !!SAMPLE_CTB(s->skip_flag, x_cb-1, y_cb); if (s->HEVClc->ctb_up_flag || y0b) - inc += SAMPLE_CTB(s->skip_flag, x_cb, y_cb-1); + inc += !!SAMPLE_CTB(s->skip_flag, x_cb, y_cb-1); return GET_CABAC(elem_offset[SKIP_FLAG] + inc); } |