[FFmpeg-cvslog] Merge commit '66acb76bb0492b263215ca9b4d927a7be39ace02'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul  9 11:52:05 2015 +0200| [7871eb43616776626ec9f9075b6d0a8cf73d159e] | committer: Michael Niedermayer

Merge commit '66acb76bb0492b263215ca9b4d927a7be39ace02'

* commit '66acb76bb0492b263215ca9b4d927a7be39ace02':
  lavc: add Intel libmfx-based HEVC encoder

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/qsv.c
	libavcodec/qsvenc.c
	libavcodec/version.h

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

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