Browse Source

Merge commit 'c77d409bf95954aceb762dd800d1ee2868c4b0d4'

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

See: b8dc5f8bb3
See: 98b377004d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.1
Michael Niedermayer 12 years ago
parent
commit
015f7ce7d7
1 changed files with 2 additions and 3 deletions
  1. +2
    -3
      libavcodec/twinvqdec.c

+ 2
- 3
libavcodec/twinvqdec.c View File

@@ -356,9 +356,8 @@ static av_cold int twinvq_decode_init(AVCodecContext *avctx)
: AV_CH_LAYOUT_STEREO;

ibps = avctx->bit_rate / (1000 * avctx->channels);

if (ibps > 255U) {
av_log(avctx, AV_LOG_ERROR, "unsupported per channel bitrate %dkbps\n", ibps);
if (ibps < 8 || ibps > 48) {
av_log(avctx, AV_LOG_ERROR, "Bad bitrate per channel value %d\n", ibps);
return AVERROR_INVALIDDATA;
}



Loading…
Cancel
Save