Commit 015f7ce7 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'c77d409b'

* commit 'c77d409b':
  twinvqdec: Check the ibps parameter separately

See: b8dc5f8b
See: 98b37700Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 4131a3cb c77d409b
...@@ -356,9 +356,8 @@ static av_cold int twinvq_decode_init(AVCodecContext *avctx) ...@@ -356,9 +356,8 @@ static av_cold int twinvq_decode_init(AVCodecContext *avctx)
: AV_CH_LAYOUT_STEREO; : AV_CH_LAYOUT_STEREO;
ibps = avctx->bit_rate / (1000 * avctx->channels); ibps = avctx->bit_rate / (1000 * avctx->channels);
if (ibps < 8 || ibps > 48) {
if (ibps > 255U) { av_log(avctx, AV_LOG_ERROR, "Bad bitrate per channel value %d\n", ibps);
av_log(avctx, AV_LOG_ERROR, "unsupported per channel bitrate %dkbps\n", ibps);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment