diff options
| author | Peter Ross <pross@xvid.org> | 2011-04-23 22:08:48 +1000 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-03-18 17:50:17 +0100 |
| commit | 8475df81587d6b7d2753574a5afa842b4893d126 (patch) | |
| tree | c37dfa8f72525808e256099f0c9611be77c82e3e /libavcodec | |
| parent | 282a1a960a75d853928b6b2b2c90951b58cb56dc (diff) | |
| download | ffmpeg-8475df81587d6b7d2753574a5afa842b4893d126.tar.gz | |
permit decoding of multichannel ADPCM_EA_XAS
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3a549eb82be709d633a0ba964b037ee2f700e0c9)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/adpcm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 277334a65c..b2d79a2ece 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -750,6 +750,7 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx) case CODEC_ID_ADPCM_EA_R1: case CODEC_ID_ADPCM_EA_R2: case CODEC_ID_ADPCM_EA_R3: + case CODEC_ID_ADPCM_EA_XAS: max_channels = 6; break; } |