[FFmpeg-cvslog] rawenc: properly allocate coded_frame

Anton Khirnov git at videolan.org
Wed Apr 29 17:00:13 CEST 2015


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Fri Apr 17 12:12:57 2015 +0200| [a09c499a2e25ded575cb9f37528384402be86ad8] | committer: Anton Khirnov

rawenc: properly allocate coded_frame

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a09c499a2e25ded575cb9f37528384402be86ad8
---

 libavcodec/rawenc.c |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/libavcodec/rawenc.c b/libavcodec/rawenc.c
index bca0d08..d6e8009 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,
 };



More information about the ffmpeg-cvslog mailing list