[FFmpeg-cvslog] avcodec/rawenc: drop sizeof(AVFrame) dependency

Michael Niedermayer git at videolan.org
Tue Sep 9 17:06:03 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep  9 13:01:37 2014 +0200| [881f96c4c2ef0c0162f63a370cbfff3c1e1feb2a] | committer: Michael Niedermayer

avcodec/rawenc: drop sizeof(AVFrame) dependency

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavcodec/rawenc.c b/libavcodec/rawenc.c
index c5d3d2e..c579230 100644
--- a/libavcodec/rawenc.c
+++ b/libavcodec/rawenc.c
@@ -35,8 +35,7 @@ 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;
-    avcodec_get_frame_defaults(avctx->coded_frame);
+    avctx->coded_frame = av_frame_alloc();
     avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
     avctx->bits_per_coded_sample = av_get_bits_per_pixel(desc);
     if(!avctx->codec_tag)
@@ -69,12 +68,18 @@ static int raw_encode(AVCodecContext *avctx, AVPacket *pkt,
     return 0;
 }
 
+static av_cold int raw_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,
     .encode2        = raw_encode,
+    .close          = raw_close,
 };



More information about the ffmpeg-cvslog mailing list