* commit '5c018ee1':
  DirectDraw Surface image decoder

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/Makefile
	libavcodec/version.h
	tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>