* commit '58c21596':
  raw, nut: Support rgba64 encoding

Conflicts:
	libavcodec/raw.c
	libavformat/nut.c

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