[libav-commits] lavc: remove disabled FF_API_TIFFENC_COMPLEVEL cruft.

Anton Khirnov git at libav.org
Fri Jan 27 10:47:47 CET 2012


Module: libav
Branch: master
Commit: 10e1ae5efffb8dd2a1932b4d965dbc6dd3338e70

Author:    Anton Khirnov <anton at khirnov.net>
Committer: Anton Khirnov <anton at khirnov.net>
Date:      Sun Jan 22 10:56:42 2012 +0100

lavc: remove disabled FF_API_TIFFENC_COMPLEVEL cruft.

---

 libavcodec/tiffenc.c |   16 ----------------
 libavcodec/version.h |    3 ---
 2 files changed, 0 insertions(+), 19 deletions(-)

diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c
index 3b2b829..0aa9740 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 b3b999b..b725bb0 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



More information about the libav-commits mailing list