[FFmpeg-cvslog] Merge commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 17 11:20:32 2014 +0100| [f1b20930f206349a666ec314d76c3fcb86c6b9a7] | committer: Michael Niedermayer

Merge commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e'

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

Conflicts:
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f1b20930f206349a666ec314d76c3fcb86c6b9a7
---