
* commit '8637f4edeee1a6bd18bc90740fafadd3e1b412aa': x86: Add CPU flag for the i686 cmov instruction Conflicts: doc/APIchanges libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '8637f4edeee1a6bd18bc90740fafadd3e1b412aa': x86: Add CPU flag for the i686 cmov instruction Conflicts: doc/APIchanges libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>