- s->mcdparams[i].index = get_bits(gb, 2);
- s->mcdparams[i].chan2 = get_bits(gb, 4);
+ s->mcdparams[i].index = bitstream_read(bc, 2);
+ s->mcdparams[i].chan2 = bitstream_read(bc, 4);
+ if (s->mcdparams[i].chan2 >= avctx->channels) {
+ av_log(avctx, AV_LOG_ERROR,
+ "invalid channel 2 (%d) for %d channel(s)\n",
+ s->mcdparams[i].chan2, avctx->channels);
+ return AVERROR_INVALIDDATA;
+ }