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>

diff --cc libavcodec/hevc.c
index 7502f4d5a57ba7fe44485930fbf5cf0733bc7cd6,4557bdf5bde015a88e568956fd9dc966b6766ab9..e1382b8e8361089f1cbbb268817a7af2497b4383
--- 1/libavcodec/hevc.c
--- 2/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@@ -2069,12 -2162,13 +2068,14 @@@ static int hls_coding_unit(HEVCContext 
          }
  
          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 :
                                           s->sps->max_transform_hierarchy_depth_inter;

diff --cc libavcodec/hevc.h
Simple merge