* commit '5a419b2d':
  pixdesc: return color properties names

Conflicts:
	libavutil/pixdesc.c
	libavutil/pixdesc.h
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>