Merge commit '6c445990e64124ad64c79423dfd3764520648c89'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc libavcodec/tiffenc.c
index e575c4c9a083c57bb9247cd732ca75423204a198,8791c549876bfc79251cfec815d7c153293056f0..f59816ec8253f17154ed7268692e0c06d0f7f58a
--- 1/libavcodec/tiffenc.c
--- 2/libavcodec/tiffenc.c
+++ b/libavcodec/tiffenc.c
@@@ -523,7 -492,16 +523,16 @@@ fail
  
  static av_cold int encode_init(AVCodecContext *avctx)
  {
 -#if !CONFIG_ZLIB
      TiffEncoderContext *s = avctx->priv_data;
+ 
++#if !CONFIG_ZLIB
+     if (s->compr == TIFF_DEFLATE) {
+         av_log(avctx, AV_LOG_ERROR,
+                "Deflate compression needs zlib compiled in\n");
+         return AVERROR(ENOSYS);
+     }
+ #endif
+ 
  #if FF_API_CODED_FRAME
  FF_DISABLE_DEPRECATION_WARNINGS
      avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;