[FFmpeg-cvslog] Merge commit '321cb8b048c7a8c0d2950f9278f36d912a886fa0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 21 00:30:31 2013 +0100| [2fb9e77ac2da4f82145a56b7d01ae4045b5da3eb] | committer: Michael Niedermayer

Merge commit '321cb8b048c7a8c0d2950f9278f36d912a886fa0'

* commit '321cb8b048c7a8c0d2950f9278f36d912a886fa0':
  hevc: store profile and level in AVCodecContext

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

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