aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-11-09 10:14:46 +0100
committerAnton Khirnov <anton@khirnov.net>2013-11-16 17:46:01 +0100
commit0ea430c75b8d90449d2878ad84669a2da2ad3cbc (patch)
tree08b52dd9490d01a5f32fbfb99fa292801ca65639
parentd48c20630214a4effcc920e93a5044bee4e2002e (diff)
downloadffmpeg-0ea430c75b8d90449d2878ad84669a2da2ad3cbc.tar.gz
lclenc: use the AVFrame API properly.
-rw-r--r--libavcodec/lclenc.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/libavcodec/lclenc.c b/libavcodec/lclenc.c
index 1f9f04676c..878d1e16f8 100644
--- a/libavcodec/lclenc.c
+++ b/libavcodec/lclenc.c
@@ -54,7 +54,6 @@
typedef struct LclEncContext {
AVCodecContext *avctx;
- AVFrame pic;
// Image type
int imgtype;
@@ -74,7 +73,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *pict, int *got_packet)
{
LclEncContext *c = avctx->priv_data;
- AVFrame * const p = &c->pic;
+ const AVFrame * const p = pict;
int i, ret;
int zret; // Zlib return code
int max_size = deflateBound(&c->zstream, avctx->width * avctx->height * 3);
@@ -85,10 +84,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
return ret;
}
- *p = *pict;
- p->pict_type= AV_PICTURE_TYPE_I;
- p->key_frame= 1;
-
if(avctx->pix_fmt != AV_PIX_FMT_BGR24){
av_log(avctx, AV_LOG_ERROR, "Format not supported!\n");
return -1;
@@ -139,7 +134,13 @@ static av_cold int encode_init(AVCodecContext *avctx)
assert(avctx->width && avctx->height);
avctx->extradata= av_mallocz(8);
- avctx->coded_frame= &c->pic;
+
+ 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;
// Will be user settable someday
c->compression = 6;
@@ -181,6 +182,8 @@ static av_cold int encode_end(AVCodecContext *avctx)
av_freep(&avctx->extradata);
deflateEnd(&c->zstream);
+ av_frame_free(&avctx->coded_frame);
+
return 0;
}