* commit '2597a842':
  tiff: Improve grayscale support

Conflicts:
	libavcodec/tiff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>