From 10e1ae5efffb8dd2a1932b4d965dbc6dd3338e70 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Sun, 22 Jan 2012 10:56:42 +0100
Subject: [PATCH] lavc: remove disabled FF_API_TIFFENC_COMPLEVEL cruft.
---
libavcodec/tiffenc.c | 16 ----------------
libavcodec/version.h | 3 ---
2 files changed, 19 deletions(-)
diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c
index 3b2b82991b9..0aa9740a99c 100644
--- a/libavcodec/tiffenc.c
+++ b/libavcodec/tiffenc.c
@@ -231,22 +231,6 @@ static int encode_frame(AVCodecContext * avctx, unsigned char *buf,
p->key_frame = 1;
avctx->coded_frame= &s->picture;
-#if FF_API_TIFFENC_COMPLEVEL
- if (avctx->compression_level != FF_COMPRESSION_DEFAULT)
- av_log(avctx, AV_LOG_WARNING, "Using compression_level to set compression "
- "algorithm is deprecated. Please use the compression_algo private "
- "option instead.\n");
- if (avctx->compression_level == 0) {
- s->compr = TIFF_RAW;
- } else if(avctx->compression_level == 2) {
- s->compr = TIFF_LZW;
-#if CONFIG_ZLIB
- } else if ((avctx->compression_level >= 3)) {
- s->compr = TIFF_DEFLATE;
-#endif
- }
-#endif
-
s->width = avctx->width;
s->height = avctx->height;
s->subsampling[0] = 1;
diff --git a/libavcodec/version.h b/libavcodec/version.h
index b3b999b2cb6..b725bb00578 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -41,9 +41,6 @@
#ifndef FF_API_REQUEST_CHANNELS
#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55)
#endif
-#ifndef FF_API_TIFFENC_COMPLEVEL
-#define FF_API_TIFFENC_COMPLEVEL (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
#ifndef FF_API_DATA_POINTERS
#define FF_API_DATA_POINTERS (LIBAVCODEC_VERSION_MAJOR < 54)
#endif
--
GitLab