aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-04-17 12:12:57 +0200
committerAnton Khirnov <anton@khirnov.net>2015-04-29 05:52:58 +0200
commita09c499a2e25ded575cb9f37528384402be86ad8 (patch)
tree69d01af06e52b04cb8d9f5399e61a1f388d733a4
parenta0f2946068c62e18cb05ac25c0df3d86077251a6 (diff)
downloadffmpeg-a09c499a2e25ded575cb9f37528384402be86ad8.tar.gz
rawenc: properly allocate coded_frame
-rw-r--r--libavcodec/rawenc.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/libavcodec/rawenc.c b/libavcodec/rawenc.c
index bca0d08b7a..d6e8009341 100644
--- a/libavcodec/rawenc.c
+++ b/libavcodec/rawenc.c
@@ -35,7 +35,10 @@ static av_cold int raw_encode_init(AVCodecContext *avctx)
{
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
- avctx->coded_frame = avctx->priv_data;
+ 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;
avctx->bits_per_coded_sample = av_get_bits_per_pixel(desc);
@@ -69,12 +72,18 @@ static int raw_encode(AVCodecContext *avctx, AVPacket *pkt,
return 0;
}
+static av_cold int raw_encode_close(AVCodecContext *avctx)
+{
+ av_frame_free(&avctx->coded_frame);
+ return 0;
+}
+
AVCodec ff_rawvideo_encoder = {
.name = "rawvideo",
.long_name = NULL_IF_CONFIG_SMALL("raw video"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_RAWVIDEO,
- .priv_data_size = sizeof(AVFrame),
.init = raw_encode_init,
+ .close = raw_encode_close,
.encode2 = raw_encode,
};