summaryrefslogtreecommitdiff
path: root/libavcodec/mpc8.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-06-03 17:40:30 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-03 17:40:30 +0200
commit44c10168cff41c200825448b77cb8feff0d316c9 (patch)
tree55ca9b99f6cc09e7f3b45b0cee8965af338bda28 /libavcodec/mpc8.c
parenta5ad3c2382ac27cf712aaba6a222ec12f5eb88da (diff)
downloadffmpeg-44c10168cff41c200825448b77cb8feff0d316c9.tar.gz
mpc8: fix channel checks
fix heap array overflow Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpc8.c')
-rw-r--r--libavcodec/mpc8.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c
index c37cd50497..652e824843 100644
--- a/libavcodec/mpc8.c
+++ b/libavcodec/mpc8.c
@@ -140,7 +140,8 @@ static av_cold int mpc8_decode_init(AVCodecContext * avctx)
c->frames = 1 << (get_bits(&gb, 3) * 2);
avctx->sample_fmt = AV_SAMPLE_FMT_S16;
- avctx->channel_layout = (avctx->channels==2) ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO;
+ avctx->channel_layout = (channels==2) ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO;
+ avctx->channels = channels;
if(vlc_initialized) return 0;
av_log(avctx, AV_LOG_DEBUG, "Initing VLC\n");