[FFmpeg-cvslog] sonic: set avctx->channels in sonic_decode_init
Andreas Cadhalpun
git at videolan.org
Tue Jun 9 23:23:17 CEST 2015
ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | Tue Jun 9 22:41:24 2015 +0200| [58995f647b5fa2e1efa33ae4f8b8a76a81ec99df] | committer: Andreas Cadhalpun
sonic: set avctx->channels in sonic_decode_init
Otherwise it can be 0 in sonic_decode_frame, causing SIGFPE crashes.
Reviewed-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58995f647b5fa2e1efa33ae4f8b8a76a81ec99df
---
libavcodec/sonic.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c
index 3db77f3..c5076f9 100644
--- a/libavcodec/sonic.c
+++ b/libavcodec/sonic.c
@@ -900,6 +900,7 @@ static av_cold int sonic_decode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_ERROR, "Only mono and stereo streams are supported by now\n");
return AVERROR_INVALIDDATA;
}
+ avctx->channels = s->channels;
s->lossless = get_bits1(&gb);
if (!s->lossless)
More information about the ffmpeg-cvslog
mailing list