[FFmpeg-cvslog] Merge commit '3a3790b8f8b56ee6abc93ccac280eb693675e294'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 19 03:13:31 2014 +0100| [9aabe6678147d947ce7a32bf9bb1e087fac7fdde] | committer: Michael Niedermayer

Merge commit '3a3790b8f8b56ee6abc93ccac280eb693675e294'

* commit '3a3790b8f8b56ee6abc93ccac280eb693675e294':
  tiff: support encoding and decoding 64bit images

Conflicts:
	libavcodec/tiff.c
	libavcodec/tiffenc.c
	libavcodec/version.h

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

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