[FFmpeg-cvslog] Merge commit 'c9c7d59b7d26f0328d612995dd9256337ae1cbfb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Nov 12 00:08:06 2014 +0100| [dadc1f5ee9d933cca94469604a15eb3d7bc939f0] | committer: Michael Niedermayer

Merge commit 'c9c7d59b7d26f0328d612995dd9256337ae1cbfb'

* commit 'c9c7d59b7d26f0328d612995dd9256337ae1cbfb':
  tiff: Use av_mallocz_array

Conflicts:
	libavcodec/tiffenc.c

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

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