* commit 'e7dfaf16':
  libavfilter: example audio filtering program

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