* commit '3a85397e8bb477eb34678d9edc52893f57003226': lavc: add Intel libmfx-based MPEG2 encoder Conflicts: Changelog configure libavcodec/allcodecs.c Merged-by: Michael Niedermayer <michaelni@gmx.at>