[FFmpeg-cvslog] Merge commit '345a96c327e8f2a8077189af9f5e8d2b3f4ad5fe'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 13 03:54:11 2014 +0200| [a64d6d5152189fce84bded8c73af5b49d6657cce] | committer: Michael Niedermayer

Merge commit '345a96c327e8f2a8077189af9f5e8d2b3f4ad5fe'

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

Conflicts:
	libavcodec/tiff.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a64d6d5152189fce84bded8c73af5b49d6657cce
---