* commit '1316df7a':
  lavu: add an API function to return the Libav version string

Conflicts:
	.gitignore
	Makefile
	cmdutils.c
	doc/APIchanges
	libavutil/avutil.h
	libavutil/utils.c

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