diff options
| author | Paul B Mahol <onemda@gmail.com> | 2023-09-05 14:46:39 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2023-09-05 23:21:39 +0200 |
| commit | 39f6d9c5c1272da15fcc6ca9186ce40661326e84 (patch) | |
| tree | 61762c4e6eb92fc74420b7e986be3a5d821e8576 | |
| parent | fdd123de1307cc40c807ddd07deef034fb721046 (diff) | |
avcodec/adxdec: add support for 6 channels
| -rw-r--r-- | libavcodec/adx.h | 4 | ||||
| -rw-r--r-- | libavcodec/adxdec.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/adx.h b/libavcodec/adx.h index 8d5e0869ae..60ce07ad61 100644 --- a/libavcodec/adx.h +++ b/libavcodec/adx.h @@ -35,9 +35,11 @@ typedef struct ADXChannelState { int s1,s2; } ADXChannelState; +#define MAX_CHANNELS 6 + typedef struct ADXContext { int channels; - ADXChannelState prev[2]; + ADXChannelState prev[MAX_CHANNELS]; int header_parsed; int eof; int cutoff; diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c index 97a7e59686..4300dede5e 100644 --- a/libavcodec/adxdec.c +++ b/libavcodec/adxdec.c @@ -70,7 +70,7 @@ static int adx_decode_header(AVCodecContext *avctx, const uint8_t *buf, /* channels */ channels = buf[7]; - if (channels <= 0 || channels > 2) + if (channels <= 0 || channels > MAX_CHANNELS) return AVERROR_INVALIDDATA; if (avctx->ch_layout.nb_channels != channels) { |