Signed-off-by: Zane van Iperen <z...@zanevaniperen.com>
---
libavcodec/adpcm.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 79c5d625d1..4de4a23289 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -162,11 +162,18 @@ static av_cold int adpcm_decode_init(AVCodecContext *
avctx)
}
break;
case AV_CODEC_ID_ADPCM_IMA_APM:
- if (avctx->extradata && avctx->extradata_size >= 16) {
- c->status[0].predictor = av_clip_intp2(AV_RL32(avctx->extradata +
0), 18);
- c->status[0].step_index = av_clip(AV_RL32(avctx->extradata + 4),
0, 88);
- c->status[1].predictor = av_clip_intp2(AV_RL32(avctx->extradata +
8), 18);
- c->status[1].step_index = av_clip(AV_RL32(avctx->extradata + 12),
0, 88);
+ if (avctx->extradata) {
+ if (avctx->extradata_size >= 28) {
+ c->status[0].predictor =
av_clip_intp2(AV_RL32(avctx->extradata + 16), 18);
+ c->status[0].step_index = av_clip(AV_RL32(avctx->extradata +
20), 0, 88);
+ c->status[1].predictor =
av_clip_intp2(AV_RL32(avctx->extradata + 4), 18);
+ c->status[1].step_index = av_clip(AV_RL32(avctx->extradata +
8), 0, 88);
+ } else if (avctx->extradata_size >= 16) {
+ c->status[0].predictor =
av_clip_intp2(AV_RL32(avctx->extradata + 0), 18);
+ c->status[0].step_index = av_clip(AV_RL32(avctx->extradata +
4), 0, 88);
+ c->status[1].predictor =
av_clip_intp2(AV_RL32(avctx->extradata + 8), 18);
+ c->status[1].step_index = av_clip(AV_RL32(avctx->extradata +
12), 0, 88);
+ }
}
break;
case AV_CODEC_ID_ADPCM_IMA_WS:
--
2.25.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
