* commit '2c6a7f93':
  hevc: do not store rqt_root_cbf in the context

Conflicts:
	libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>