diff options
| author | Rodger Combs <rodger.combs@gmail.com> | 2015-09-11 09:04:23 -0500 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-09-12 22:09:35 +0200 |
| commit | 3f9fa2d0b58b142b165d4a8eaa61d7e837a76838 (patch) | |
| tree | d95933e06782f758646bc6fe00b7792077343cfc | |
| parent | 6a074cfa1514c37c4ce51874ea473719f72813b6 (diff) | |
| download | ffmpeg-3f9fa2d0b58b142b165d4a8eaa61d7e837a76838.tar.gz | |
ADPCM: Bump THP channel limit to 14
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/adpcm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 52d0d44cc2..ba38041f4a 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -84,7 +84,7 @@ static const int swf_index_tables[4][16] = { /* end of tables */ typedef struct ADPCMDecodeContext { - ADPCMChannelStatus status[10]; + ADPCMChannelStatus status[14]; int vqa_version; /**< VQA version. Used for ADPCM_IMA_WS */ int has_status; } ADPCMDecodeContext; @@ -109,7 +109,7 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx) break; case AV_CODEC_ID_ADPCM_THP: case AV_CODEC_ID_ADPCM_THP_LE: - max_channels = 10; + max_channels = 14; break; } if (avctx->channels < min_channels || avctx->channels > max_channels) { @@ -1431,7 +1431,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, case AV_CODEC_ID_ADPCM_THP: case AV_CODEC_ID_ADPCM_THP_LE: { - int table[10][16]; + int table[14][16]; int ch; #define THP_GET16(g) \ |