From 577fed3b7cef50d9d0f2e8a4b2f215129da49b4e Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 5 Jan 2012 16:55:33 +0100 Subject: gifenc: switch to encode2(). --- libavcodec/gif.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'libavcodec/gif.c') diff --git a/libavcodec/gif.c b/libavcodec/gif.c index c7e7bcd185..6b190f1d0c 100644 --- a/libavcodec/gif.c +++ b/libavcodec/gif.c @@ -43,6 +43,7 @@ #include "avcodec.h" #include "bytestream.h" +#include "internal.h" #include "lzw.h" /* The GIF format uses reversed order for bitstreams... */ @@ -141,20 +142,32 @@ static av_cold int gif_encode_init(AVCodecContext *avctx) } /* better than nothing gif encoder */ -static int gif_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, int buf_size, void *data) +static int gif_encode_frame(AVCodecContext *avctx, AVPacket *pkt, + const AVFrame *pict, int *got_packet) { GIFContext *s = avctx->priv_data; - AVFrame *pict = data; AVFrame *const p = (AVFrame *)&s->picture; - uint8_t *outbuf_ptr = outbuf; - uint8_t *end = outbuf + buf_size; + uint8_t *outbuf_ptr, *end; + int ret; + + if ((ret = ff_alloc_packet(pkt, avctx->width*avctx->height*7/5 + FF_MIN_BUFFER_SIZE)) < 0) { + av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n"); + return ret; + } + outbuf_ptr = pkt->data; + end = pkt->data + pkt->size; *p = *pict; p->pict_type = AV_PICTURE_TYPE_I; p->key_frame = 1; gif_image_write_header(avctx, &outbuf_ptr, (uint32_t *)pict->data[1]); gif_image_write_image(avctx, &outbuf_ptr, end, pict->data[0], pict->linesize[0]); - return outbuf_ptr - outbuf; + + pkt->size = outbuf_ptr - pkt->data; + pkt->flags |= AV_PKT_FLAG_KEY; + *got_packet = 1; + + return 0; } static int gif_encode_close(AVCodecContext *avctx) @@ -172,7 +185,7 @@ AVCodec ff_gif_encoder = { .id = CODEC_ID_GIF, .priv_data_size = sizeof(GIFContext), .init = gif_encode_init, - .encode = gif_encode_frame, + .encode2 = gif_encode_frame, .close = gif_encode_close, .pix_fmts= (const enum PixelFormat[]){PIX_FMT_RGB8, PIX_FMT_BGR8, PIX_FMT_RGB4_BYTE, PIX_FMT_BGR4_BYTE, PIX_FMT_GRAY8, PIX_FMT_PAL8, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("GIF (Graphics Interchange Format)"), -- cgit v1.2.3