roqvideoenc: set enc->avctx in roq_encode_init

Message ID 20150311193137.7EB455DD03@aruru.libav.org
State New
Headers show

Commit Message

Janne Grunau March 11, 2015, 7:31 p.m.
Module: libav
Branch: master
Commit: 67142a8c721c7916c9ad2eb439c14d567aeb88c1

Author:    Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Committer: Anton Khirnov <anton@khirnov.net>
Date:      Mon Mar  9 19:24:09 2015 +0100

roqvideoenc: set enc->avctx in roq_encode_init

So far it is only set in roq_encode_frame, but it is used in
roq_encode_end to free the coded_frame. This currently segfaults if
roq_encode_frame is not called between roq_encode_init and
roq_encode_end.

CC:libav-stable@libav.org
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

---

 libavcodec/roqvideoenc.c |    2 ++
 1 file changed, 2 insertions(+)

Patch

diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c
index fd651e9..872bee8 100644
--- a/libavcodec/roqvideoenc.c
+++ b/libavcodec/roqvideoenc.c
@@ -992,6 +992,8 @@  static av_cold int roq_encode_init(AVCodecContext *avctx)
 
     av_lfg_init(&enc->randctx, 1);
 
+    enc->avctx = avctx;
+
     enc->framesSinceKeyframe = 0;
     if ((avctx->width & 0xf) || (avctx->height & 0xf)) {
         av_log(avctx, AV_LOG_ERROR, "Dimensions must be divisible by 16\n");