Merge commit 'c9c7d59b7d26f0328d612995dd9256337ae1cbfb'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 23:08:06 +0000 (00:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 23:08:06 +0000 (00:08 +0100)
commitdadc1f5ee9d933cca94469604a15eb3d7bc939f0
treed72d4075d9092cced7cdf7f6b88889fb6e81735f
parent1e16492b989e0f1bd262be6aaf5ebf7857f46dea
parentc9c7d59b7d26f0328d612995dd9256337ae1cbfb
Merge commit 'c9c7d59b7d26f0328d612995dd9256337ae1cbfb'

* commit 'c9c7d59b7d26f0328d612995dd9256337ae1cbfb':
  tiff: Use av_mallocz_array

Conflicts:
libavcodec/tiffenc.c

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