* qatar/master: lavu: Move preprocessor macros in a separate file Conflicts: libavutil/avutil.h libavutil/utils.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>