Mercurial > libavcodec.hg
diff utils.c @ 12462:ffb3668ff7af libavcodec
Use new imgutils.h API names, fix deprecation warnings.
author | stefano |
---|---|
date | Tue, 07 Sep 2010 19:15:29 +0000 |
parents | 914f484bb476 |
children | d821f7c64fc9 |
line wrap: on
line diff
--- a/utils.c Mon Sep 06 19:26:18 2010 +0000 +++ b/utils.c Tue Sep 07 19:15:29 2010 +0000 @@ -215,7 +215,7 @@ #if LIBAVCODEC_VERSION_MAJOR < 53 int avcodec_check_dimensions(void *av_log_ctx, unsigned int w, unsigned int h){ - return av_check_image_size(w, h, 0, av_log_ctx); + return av_image_check_size(w, h, 0, av_log_ctx); } #endif @@ -235,7 +235,7 @@ return -1; } - if(av_check_image_size(w, h, 0, s)) + if(av_image_check_size(w, h, 0, s)) return -1; if(s->internal_buffer==NULL){ @@ -487,7 +487,7 @@ #define SANE_NB_CHANNELS 128U if (((avctx->coded_width || avctx->coded_height) - && av_check_image_size(avctx->coded_width, avctx->coded_height, 0, avctx)) + && av_image_check_size(avctx->coded_width, avctx->coded_height, 0, avctx)) || avctx->channels > SANE_NB_CHANNELS) { ret = AVERROR(EINVAL); goto free_and_end; @@ -554,7 +554,7 @@ av_log(avctx, AV_LOG_ERROR, "buffer smaller than minimum size\n"); return -1; } - if(av_check_image_size(avctx->width, avctx->height, 0, avctx)) + if(av_image_check_size(avctx->width, avctx->height, 0, avctx)) return -1; if((avctx->codec->capabilities & CODEC_CAP_DELAY) || pict){ int ret = avctx->codec->encode(avctx, buf, buf_size, pict); @@ -604,7 +604,7 @@ int ret; *got_picture_ptr= 0; - if((avctx->coded_width||avctx->coded_height) && av_check_image_size(avctx->coded_width, avctx->coded_height, 0, avctx)) + if((avctx->coded_width||avctx->coded_height) && av_image_check_size(avctx->coded_width, avctx->coded_height, 0, avctx)) return -1; if((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size){ ret = avctx->codec->decode(avctx, picture, got_picture_ptr,