[FFmpeg-cvslog] Merge commit '1ae7afd256f9af1eb4f63f9adcf03d581ce4e2b5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr  3 21:11:19 2015 +0200| [a7a6194ec4103656bfdeac4616753dde23819a14] | committer: Michael Niedermayer

Merge commit '1ae7afd256f9af1eb4f63f9adcf03d581ce4e2b5'

* commit '1ae7afd256f9af1eb4f63f9adcf03d581ce4e2b5':
  hevc: split out setting AVCodecContext parameters

Conflicts:
	libavcodec/hevc.c

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

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