Browse Source

tiffenc: deprecate using compression_level

tags/n0.9
Anton Khirnov 14 years ago
parent
commit
8b7412fe4e
2 changed files with 10 additions and 0 deletions
  1. +6
    -0
      libavcodec/tiffenc.c
  2. +4
    -0
      libavcodec/version.h

+ 6
- 0
libavcodec/tiffenc.c View File

@@ -231,6 +231,11 @@ 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) {
@@ -240,6 +245,7 @@ static int encode_frame(AVCodecContext * avctx, unsigned char *buf,
s->compr = TIFF_DEFLATE;
#endif
}
#endif

s->width = avctx->width;
s->height = avctx->height;


+ 4
- 0
libavcodec/version.h View File

@@ -107,5 +107,9 @@
#ifndef FF_API_INTERNAL_CONTEXT
#define FF_API_INTERNAL_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 54)
#endif
#ifndef FF_API_TIFFENC_COMPLEVEL
#define FF_API_TIFFENC_COMPLEVEL (LIBAVCODEC_VERSION_MAJOR < 54)
#endif


#endif /* AVCODEC_VERSION_H */

Loading…
Cancel
Save