* commit '4e08c821106fc1d6d358864abf0d8488b12f38c6': lavc: add an Intel libmfx-based H.264 decoder Conflicts: configure libavcodec/Makefile libavcodec/allcodecs.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Based on the code by Luca Barbato <lu_zero@gentoo.org> and Yukinori Yamazoe <drocon11@gmail.com>.