[FFmpeg-cvslog] Merge commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Jul 26 01:20:46 2015 +0200| [508b79e6c1dc40d9d96d027ed38dab3a9b9a7287] | committer: Michael Niedermayer

Merge commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986'

* commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986':
  lavc: add Intel libmfx-based HEVC decoder.

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/qsvdec.c
	libavcodec/qsvdec_h2645.c
	libavcodec/version.h

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

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