* commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd': x86: dsputil: Move inline assembly macros to a separate header Conflicts: libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>