* commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0': avutil: Move library version related macros to version.h Conflicts: libavcodec/version.h libavresample/version.h libavutil/avutil.h libavutil/utils.c See: 183117fed7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
183117fed7