2 Commits

Author	SHA1	Message	Date
Michael Niedermayer	0a731e4596	Merge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2' ... * commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2': lavc: add Intel libmfx-based H.264 encoder Conflicts: Changelog libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2015-03-28 01:33:27 +01:00
Anton Khirnov	72b7441a10	lavc: add Intel libmfx-based H.264 encoder	2015-03-27 22:02:10 +01:00