[FFmpeg-cvslog] Merge commit '920bca3e2332dced9c78bd14cfc2ff138188bd57'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 17 11:05:58 2014 +0100| [7cbe1e044701898aadda9958ddb67f6ea95fc72b] | committer: Michael Niedermayer

Merge commit '920bca3e2332dced9c78bd14cfc2ff138188bd57'

* commit '920bca3e2332dced9c78bd14cfc2ff138188bd57':
  hevc: do not store pcm_flag in the context

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

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