diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 11:20:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 11:20:32 +0100 |
| commit | f1b20930f206349a666ec314d76c3fcb86c6b9a7 (patch) | |
| tree | a8a94489ff233ad1b5704eeec083110723761c78 /libavcodec/hevc.c | |
| parent | 7cbe1e044701898aadda9958ddb67f6ea95fc72b (diff) | |
| parent | 2c6a7f9348378f887066fb1669c46b9485e8ef3e (diff) | |
Merge commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e'
* commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e':
hevc: do not store rqt_root_cbf in the context
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc.c')
| -rw-r--r-- | libavcodec/hevc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 7502f4d5a5..e1382b8e83 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -1962,7 +1962,6 @@ static int hls_coding_unit(HEVCContext *s, int x0, int y0, int log2_cb_size) lc->cu.x = x0; lc->cu.y = y0; - lc->cu.rqt_root_cbf = 1; lc->cu.pred_mode = MODE_INTRA; lc->cu.part_mode = PART_2Nx2N; lc->cu.intra_split_flag = 0; @@ -2069,11 +2068,13 @@ static int hls_coding_unit(HEVCContext *s, int x0, int y0, int log2_cb_size) } if (!pcm_flag) { + int rqt_root_cbf = 1; + if (lc->cu.pred_mode != MODE_INTRA && !(lc->cu.part_mode == PART_2Nx2N && lc->pu.merge_flag)) { - lc->cu.rqt_root_cbf = ff_hevc_no_residual_syntax_flag_decode(s); + rqt_root_cbf = ff_hevc_no_residual_syntax_flag_decode(s); } - if (lc->cu.rqt_root_cbf) { + if (rqt_root_cbf) { const static int cbf[2] = { 0 }; lc->cu.max_trafo_depth = lc->cu.pred_mode == MODE_INTRA ? s->sps->max_transform_hierarchy_depth_intra + lc->cu.intra_split_flag : |