[FFmpeg-cvslog] roqvideoenc: set enc->avctx in roq_encode_init
Andreas Cadhalpun
git at videolan.org
Fri Mar 13 13:22:58 CET 2015
ffmpeg | branch: release/2.6 | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | Mon Mar 9 19:24:09 2015 +0100| [016bf7cb817b1d118ddb9e9ba99c74030203c9e7] | committer: Michael Niedermayer
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.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit cf82c426fadf90105e1fb9d5ecd267cc3aa2b288)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=016bf7cb817b1d118ddb9e9ba99c74030203c9e7
---
libavcodec/roqvideoenc.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c
index 3215f0a..89879e8 100644
--- a/libavcodec/roqvideoenc.c
+++ b/libavcodec/roqvideoenc.c
@@ -999,6 +999,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");
More information about the ffmpeg-cvslog
mailing list