virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

gif: use the AVFrame API properly.

Browse Source
This commit is contained in:
Anton Khirnov 2013-11-09 10:14:46 +01:00
parent 45bde93eef
commit 219b35f5d1
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/gif.c
View File

@ -53,7 +53,6 @@
#include "put_bits.h" #include "put_bits.h"
typedef struct { typedef struct {
AVFrame picture;
LZWState *lzw; LZWState *lzw;
uint8_t *buf; uint8_t *buf;
} GIFContext; } GIFContext;
@ -131,7 +130,13 @@ static av_cold int gif_encode_init(AVCodecContext *avctx)
{ {
GIFContext *s = avctx->priv_data; GIFContext *s = avctx->priv_data;
avctx->coded_frame = &s->picture; avctx->coded_frame = av_frame_alloc();
if (!avctx->coded_frame)
return AVERROR(ENOMEM);
avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
avctx->coded_frame->key_frame = 1;
s->lzw = av_mallocz(ff_lzw_encode_state_size); s->lzw = av_mallocz(ff_lzw_encode_state_size);
if (!s->lzw) if (!s->lzw)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -145,8 +150,6 @@ static av_cold int gif_encode_init(AVCodecContext *avctx)
static int gif_encode_frame(AVCodecContext *avctx, AVPacket *pkt, static int gif_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *pict, int *got_packet) const AVFrame *pict, int *got_packet)
{ {
GIFContext *s = avctx->priv_data;
AVFrame *const p = &s->picture;
uint8_t *outbuf_ptr, *end; uint8_t *outbuf_ptr, *end;
int ret; int ret;
@ -157,9 +160,6 @@ static int gif_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
outbuf_ptr = pkt->data; outbuf_ptr = pkt->data;
end = pkt->data + pkt->size; 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_header(avctx, &outbuf_ptr, (uint32_t *)pict->data[1]);
gif_image_write_image(avctx, &outbuf_ptr, end, pict->data[0], pict->linesize[0]); gif_image_write_image(avctx, &outbuf_ptr, end, pict->data[0], pict->linesize[0]);
@ -174,6 +174,8 @@ static int gif_encode_close(AVCodecContext *avctx)
{ {
GIFContext *s = avctx->priv_data; GIFContext *s = avctx->priv_data;
av_frame_free(&avctx->coded_frame);
av_freep(&s->lzw); av_freep(&s->lzw);
av_freep(&s->buf); av_freep(&s->buf);
return 0; return 0;