[FFmpeg-cvslog] Merge commit '18156b53f9b642b71c182c5c9818175a61572d2b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Jul 13 16:30:41 2015 +0200| [d13fc982470f5fe89b92ebbb93a101fb2b9e851e] | committer: Michael Niedermayer

Merge commit '18156b53f9b642b71c182c5c9818175a61572d2b'

* commit '18156b53f9b642b71c182c5c9818175a61572d2b':
  hevc: do not pass an entire HEVCContext into export_stream_params()

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

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