From f890677d05bc4e8b494a73373ab4cc19791bf884 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Wed, 14 Oct 2015 11:33:24 +0200 Subject: Replace any remaining avpicture function with imgutils avpicture_get_size() -> av_image_get_buffer_size() Signed-off-by: Vittorio Giovara --- libavcodec/pnmenc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libavcodec/pnmenc.c') diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index 791176a11c..f8c600f937 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/imgutils.h" #include "libavutil/pixdesc.h" #include "avcodec.h" #include "bytestream.h" @@ -31,10 +32,10 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame * const p = pict; int i, h, h1, c, n, linesize, ret; uint8_t *ptr, *ptr1, *ptr2; + int size = av_image_get_buffer_size(avctx->pix_fmt, + avctx->width, avctx->height, 1); - if ((ret = ff_alloc_packet(pkt, avpicture_get_size(avctx->pix_fmt, - avctx->width, - avctx->height) + 200)) < 0) { + if ((ret = ff_alloc_packet(pkt, size + 200)) < 0) { av_log(avctx, AV_LOG_ERROR, "encoded frame too large\n"); return ret; } -- cgit v1.2.3