* commit 'ae17878f':
  BRender PIX image decoder

Conflicts:
	doc/general.texi
	libavcodec/Makefile
	libavcodec/version.h

See: 492a5f83, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>