[FFmpeg-cvslog] sonic: set avctx->channels in sonic_decode_init

[Andreas Cadhalpun]

ffmpeg | branch: release/2.2 | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | 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 <michaelni at gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
(cherry picked from commit 58995f647b5fa2e1efa33ae4f8b8a76a81ec99df)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> 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)