* commit '14abeaa4':
  build: Separate building programs linking against libav* from building av*

Conflicts:
	Makefile
	doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>