Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>