generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sunrastenc: use the AVFrame API properly.

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

13
libavcodec/sunrastenc.c
View File

@ -25,7 +25,6 @@
#include "sunrast.h" #include "sunrast.h"
typedef struct SUNRASTContext { typedef struct SUNRASTContext {
AVFrame picture;
PutByteContext p; PutByteContext p;
int depth; ///< depth of pixel int depth; ///< depth of pixel
int length; ///< length (bytes) of image int length; ///< length (bytes) of image
@ -154,7 +153,10 @@ static av_cold int sunrast_encode_init(AVCodecContext *avctx)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
avctx->coded_frame = &s->picture; avctx->coded_frame = av_frame_alloc();
if (!avctx->coded_frame)
return AVERROR(ENOMEM);
avctx->coded_frame->key_frame = 1; avctx->coded_frame->key_frame = 1;
avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
s->maptype = RMT_NONE; s->maptype = RMT_NONE;
@ -207,6 +209,12 @@ static int sunrast_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
return 0; return 0;
} }
static av_cold int sunrast_encode_close(AVCodecContext *avctx)
{
av_frame_free(&avctx->coded_frame);
return 0;
}
static const AVCodecDefault sunrast_defaults[] = { static const AVCodecDefault sunrast_defaults[] = {
{ "coder", "rle" }, { "coder", "rle" },
{ NULL }, { NULL },
@ -219,6 +227,7 @@ AVCodec ff_sunrast_encoder = {
.id = AV_CODEC_ID_SUNRAST, .id = AV_CODEC_ID_SUNRAST,
.priv_data_size = sizeof(SUNRASTContext), .priv_data_size = sizeof(SUNRASTContext),
.init = sunrast_encode_init, .init = sunrast_encode_init,
.close = sunrast_encode_close,
.encode2 = sunrast_encode_frame, .encode2 = sunrast_encode_frame,
.defaults = sunrast_defaults, .defaults = sunrast_defaults,
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_BGR24, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_BGR24,