* commit 'b83d1ee3':
  avutil: Move library version related macros to version.h

Conflicts:
	libavcodec/version.h
	libavresample/version.h
	libavutil/avutil.h
	libavutil/utils.c

See: 183117feMerged-by: Michael Niedermayer <michaelni@gmx.at>