* commit '72b7441a':
  lavc: add Intel libmfx-based H.264 encoder

Conflicts:
	Changelog
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>