lavc: remove disabled FF_API_TIFFENC_COMPLEVEL cruft.
This commit is contained in:
parent
370e923e0b
commit
10e1ae5eff
@ -231,22 +231,6 @@ static int encode_frame(AVCodecContext * avctx, unsigned char *buf,
|
|||||||
p->key_frame = 1;
|
p->key_frame = 1;
|
||||||
avctx->coded_frame= &s->picture;
|
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->width = avctx->width;
|
||||||
s->height = avctx->height;
|
s->height = avctx->height;
|
||||||
s->subsampling[0] = 1;
|
s->subsampling[0] = 1;
|
||||||
|
@ -41,9 +41,6 @@
|
|||||||
#ifndef FF_API_REQUEST_CHANNELS
|
#ifndef FF_API_REQUEST_CHANNELS
|
||||||
#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55)
|
#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_TIFFENC_COMPLEVEL
|
|
||||||
#define FF_API_TIFFENC_COMPLEVEL (LIBAVCODEC_VERSION_MAJOR < 54)
|
|
||||||
#endif
|
|
||||||
#ifndef FF_API_DATA_POINTERS
|
#ifndef FF_API_DATA_POINTERS
|
||||||
#define FF_API_DATA_POINTERS (LIBAVCODEC_VERSION_MAJOR < 54)
|
#define FF_API_DATA_POINTERS (LIBAVCODEC_VERSION_MAJOR < 54)
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user