* commit '345a96c3':
  tiffdec: remove an unneeded variable

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