[FFmpeg-cvslog] sonic: set avctx->channels in sonic_decode_init
ffmpeg | branch: master | Andreas Cadhalpun | 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 Signed-off-by: Andreas Cadhalpun > 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) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] sonic: set avctx->channels in sonic_decode_init
ffmpeg | branch: release/2.2 | Andreas Cadhalpun | Tue Jun 9 22:41:24 2015 +0200| [f87d76e659e0a4048ffe86f183f55d6811ff4143] | committer: Michael Niedermayer sonic: set avctx->channels in sonic_decode_init Otherwise it can be 0 in sonic_decode_frame, causing SIGFPE crashes. Reviewed-by: Michael Niedermayer Signed-off-by: Andreas Cadhalpun (cherry picked from commit 58995f647b5fa2e1efa33ae4f8b8a76a81ec99df) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f87d76e659e0a4048ffe86f183f55d6811ff4143 --- libavcodec/sonic.c |1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c index a5e573a..7f154b4 100644 --- a/libavcodec/sonic.c +++ b/libavcodec/sonic.c @@ -884,6 +884,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) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] sonic: set avctx->channels in sonic_decode_init
ffmpeg | branch: release/2.6 | Andreas Cadhalpun | Tue Jun 9 22:41:24 2015 +0200| [3ea15a4547f83b4d7b5b9c408cb02478703730f2] | committer: Michael Niedermayer sonic: set avctx->channels in sonic_decode_init Otherwise it can be 0 in sonic_decode_frame, causing SIGFPE crashes. Reviewed-by: Michael Niedermayer Signed-off-by: Andreas Cadhalpun (cherry picked from commit 58995f647b5fa2e1efa33ae4f8b8a76a81ec99df) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ea15a4547f83b4d7b5b9c408cb02478703730f2 --- 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) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] sonic: set avctx->channels in sonic_decode_init
ffmpeg | branch: release/2.5 | Andreas Cadhalpun | Tue Jun 9 22:41:24 2015 +0200| [da13957525a7939599cf7f425c2feb00ea5a] | committer: Michael Niedermayer sonic: set avctx->channels in sonic_decode_init Otherwise it can be 0 in sonic_decode_frame, causing SIGFPE crashes. Reviewed-by: Michael Niedermayer Signed-off-by: Andreas Cadhalpun (cherry picked from commit 58995f647b5fa2e1efa33ae4f8b8a76a81ec99df) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=da13957525a7939599cf7f425c2feb00ea5a --- 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) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] sonic: set avctx->channels in sonic_decode_init
ffmpeg | branch: release/2.4 | Andreas Cadhalpun | Tue Jun 9 22:41:24 2015 +0200| [c5dd6fefd41eec9c6dc62a4947aaa4ef7a1491a9] | committer: Michael Niedermayer sonic: set avctx->channels in sonic_decode_init Otherwise it can be 0 in sonic_decode_frame, causing SIGFPE crashes. Reviewed-by: Michael Niedermayer Signed-off-by: Andreas Cadhalpun (cherry picked from commit 58995f647b5fa2e1efa33ae4f8b8a76a81ec99df) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c5dd6fefd41eec9c6dc62a4947aaa4ef7a1491a9 --- 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) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
