Merge commit '6c445990e64124ad64c79423dfd3764520648c89'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 14 Nov 2016 11:32:08 +0000 (12:32 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 14 Nov 2016 11:32:08 +0000 (12:32 +0100)
commit985bc8b49683761e5014a22146d4346c951680ad
tree8ec2c827600cc462da1257ae8953986c5036fbff
parentbebab21176c1f052f748cfb2384cc01e0bdb13f4
parent6c445990e64124ad64c79423dfd3764520648c89
Merge commit '6c445990e64124ad64c79423dfd3764520648c89'

* commit '6c445990e64124ad64c79423dfd3764520648c89':
  tiffenc: Check zlib support for deflate option during initialization

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/tiffenc.c