Merge commit '58bc38a5f224d29b79338200459792c765c25fd5'

* commit '58bc38a5f224d29b79338200459792c765c25fd5':
  tiffdec: use correct data type for palette entries and set alpha to 0xFF

Conflicts:
	libavcodec/tiff.c

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