* commit 'cccac765':
  png: Support rgb48 and rgba64 encoding

Conflicts:
	libavcodec/pngenc.c

See: f94ce3bcMerged-by: Michael Niedermayer <michaelni@gmx.at>