RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dpxenc: use the AVFrame API properly.

This commit is contained in:
Anton Khirnov 2013-11-09 10:14:46 +01:00
parent 2a85a192c7
commit 4e7e8055a7
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/dpxenc.c
View File

@ -26,7 +26,6 @@
#include "internal.h" #include "internal.h"
typedef struct DPXContext { typedef struct DPXContext {
AVFrame picture;
int big_endian; int big_endian;
int bits_per_component; int bits_per_component;
int descriptor; int descriptor;
@ -36,7 +35,10 @@ static av_cold int encode_init(AVCodecContext *avctx)
{ {
DPXContext *s = avctx->priv_data; DPXContext *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->pict_type = AV_PICTURE_TYPE_I;
avctx->coded_frame->key_frame = 1; avctx->coded_frame->key_frame = 1;
@ -173,6 +175,12 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
return 0; return 0;
} }
static av_cold int encode_close(AVCodecContext *avctx)
{
av_frame_free(&avctx->coded_frame);
return 0;
}
AVCodec ff_dpx_encoder = { AVCodec ff_dpx_encoder = {
.name = "dpx", .name = "dpx",
.long_name = NULL_IF_CONFIG_SMALL("DPX image"), .long_name = NULL_IF_CONFIG_SMALL("DPX image"),
@ -181,6 +189,7 @@ AVCodec ff_dpx_encoder = {
.priv_data_size = sizeof(DPXContext), .priv_data_size = sizeof(DPXContext),
.init = encode_init, .init = encode_init,
.encode2 = encode_frame, .encode2 = encode_frame,
.close = encode_close,
.pix_fmts = (const enum AVPixelFormat[]){ .pix_fmts = (const enum AVPixelFormat[]){
AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB24,
AV_PIX_FMT_RGBA, AV_PIX_FMT_RGBA,