* commit '60cbd6ad':
  tiff: support reading gray+alpha at 8 bits

Conflicts:
	libavcodec/tiff.c

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