diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-08-06 09:37:04 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-08-06 09:37:04 +0000 |
| commit | 6ce9b4310cf1eba1a356191f30460a97e6653b91 (patch) | |
| tree | 4211e63439fb2ee8a0f063fe62b6ef1a4a0ad393 /libavcodec/tiff.c | |
| parent | 899a507fa690e533f62e95a0c5d1caf487cf72ce (diff) | |
Remove use of the deprecated function avcodec_check_dimensions(), use
av_check_image_size() instead.
Originally committed as revision 24711 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/tiff.c')
| -rw-r--r-- | libavcodec/tiff.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 2f3cef2b00..78c52cb2dd 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -33,6 +33,7 @@ #include "faxcompr.h" #include "libavutil/common.h" #include "libavutil/intreadwrite.h" +#include "libavcore/imgutils.h" typedef struct TiffContext { AVCodecContext *avctx; @@ -305,7 +306,7 @@ static int tiff_decode_tag(TiffContext *s, const uint8_t *start, const uint8_t * return -1; } if(s->width != s->avctx->width || s->height != s->avctx->height){ - if(avcodec_check_dimensions(s->avctx, s->width, s->height)) + if(av_check_image_size(s->width, s->height, 0, s->avctx)) return -1; avcodec_set_dimensions(s->avctx, s->width, s->height); } @@ -507,7 +508,7 @@ static int decode_frame(AVCodecContext *avctx, s->bpp = 1; avctx->pix_fmt = PIX_FMT_MONOBLACK; if(s->width != s->avctx->width || s->height != s->avctx->height){ - if(avcodec_check_dimensions(s->avctx, s->width, s->height)) + if(av_check_image_size(s->width, s->height, 0, s->avctx)) return -1; avcodec_set_dimensions(s->avctx, s->width, s->height); } |