X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fadpcm.c;h=c176b5e03deaad3025b8ee47192d43ca1a27040a;hb=4640da7e58509996ff03b1a0b018ca8f337391c7;hp=688fba430c07e6d052517385b9f9eb66395d96f7;hpb=484e59a0a0329c4005ddacd05051925345f4362f;p=ffmpeg diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 688fba430c0..c176b5e03de 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -91,9 +91,13 @@ typedef struct ADPCMDecodeContext { static av_cold int adpcm_decode_init(AVCodecContext * avctx) { ADPCMDecodeContext *c = avctx->priv_data; + unsigned int min_channels = 1; unsigned int max_channels = 2; switch(avctx->codec->id) { + case CODEC_ID_ADPCM_EA: + min_channels = 2; + break; case CODEC_ID_ADPCM_EA_R1: case CODEC_ID_ADPCM_EA_R2: case CODEC_ID_ADPCM_EA_R3: @@ -101,7 +105,7 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx) max_channels = 6; break; } - if (avctx->channels <= 0 || avctx->channels > max_channels) { + if (avctx->channels < min_channels || avctx->channels > max_channels) { av_log(avctx, AV_LOG_ERROR, "Invalid number of channels\n"); return AVERROR(EINVAL); }