diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 12:32:08 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-14 12:32:08 +0100 |
| commit | 985bc8b49683761e5014a22146d4346c951680ad (patch) | |
| tree | 8ec2c827600cc462da1257ae8953986c5036fbff /libavcodec/tiffenc.c | |
| parent | bebab21176c1f052f748cfb2384cc01e0bdb13f4 (diff) | |
| parent | 6c445990e64124ad64c79423dfd3764520648c89 (diff) | |
| download | ffmpeg-985bc8b49683761e5014a22146d4346c951680ad.tar.gz | |
Merge commit '6c445990e64124ad64c79423dfd3764520648c89'
* commit '6c445990e64124ad64c79423dfd3764520648c89':
tiffenc: Check zlib support for deflate option during initialization
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/tiffenc.c')
| -rw-r--r-- | libavcodec/tiffenc.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index e575c4c9a0..f59816ec82 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -524,6 +524,15 @@ fail: static av_cold int encode_init(AVCodecContext *avctx) { 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; @@ -554,9 +563,7 @@ static const AVOption options[] = { { "packbits", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = TIFF_PACKBITS }, 0, 0, VE, "compression_algo" }, { "raw", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = TIFF_RAW }, 0, 0, VE, "compression_algo" }, { "lzw", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = TIFF_LZW }, 0, 0, VE, "compression_algo" }, -#if CONFIG_ZLIB { "deflate", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = TIFF_DEFLATE }, 0, 0, VE, "compression_algo" }, -#endif { NULL }, }; |