ffmpeg | branch: release/2.4 | Michael Niedermayer <[email protected]> | Wed Nov 12 11:13:10 2014 +0100| [12e1a7013a53ad957c4ff11a3aebc0763024d24b] | committer: Luca Barbato
roqaudio: Always use the frame buffer on flush Prevent NULL dereference. CC: [email protected] Bug-Id: CID 703669 Signed-off-by: Vittorio Giovara <[email protected]> (cherry picked from commit 55b59fab880a9fcdd30f97c5170af282087ac4f7) Signed-off-by: Luca Barbato <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=12e1a7013a53ad957c4ff11a3aebc0763024d24b --- libavcodec/roqaudioenc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/roqaudioenc.c b/libavcodec/roqaudioenc.c index f97d5d6..402eb78 100644 --- a/libavcodec/roqaudioenc.c +++ b/libavcodec/roqaudioenc.c @@ -147,15 +147,16 @@ static int roq_dpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, context->input_frames++; return 0; } - in = context->frame_buffer; } + if (context->input_frames < 8) + in = context->frame_buffer; if (stereo) { context->lastSample[0] &= 0xFF00; context->lastSample[1] &= 0xFF00; } - if (context->input_frames == 7 || !in) + if (context->input_frames == 7) data_size = avctx->channels * context->buffered_samples; else data_size = avctx->channels * avctx->frame_size; _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
