* commit 'e50f5d3c':
  Alias PIX image encoder and decoder

Conflicts:
	Changelog
	libavcodec/allcodecs.c
	libavcodec/version.h
	libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>