From patchwork Tue Jun 9 00:19:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 20226 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 271F744AA97 for ; Tue, 9 Jun 2020 03:19:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 10CF768B332; Tue, 9 Jun 2020 03:19:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40134.protonmail.ch (mail-40134.protonmail.ch [185.70.40.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B5546882D5 for ; Tue, 9 Jun 2020 03:19:43 +0300 (EEST) Date: Tue, 09 Jun 2020 00:19:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1591661982; bh=/nYnoQSo7WdXLRLWdxj8hU8ZlLzofKj5B7n24gPlPt8=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=M4wR0LfnVxFrXaQMsaA6fFKZoNUG20uX9jtpNfuZbNfGDWvdAwTD2ARFROvLMclOi z7VSEr3tan9mHD5Xs843A3mQgY+Y5NIIVkbTMLoyrqC0BUWKM1JFkE8XNke9ixfU4d T9fXSAh1PDpXd8Lh+c/tKNHlbZ9M+eHeKGdDKEO0= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200609001730.961175-3-zane@zanevaniperen.com> In-Reply-To: <20200609001730.961175-1-zane@zanevaniperen.com> References: <20200609001730.961175-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch Subject: [FFmpeg-devel] [PATCH 2/7] avcodec/adpcm_ima_apm: prepare extradata handling for encoder X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 79c5d625d1..328971adf1 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -162,11 +162,11 @@ 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 && 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); } break; case AV_CODEC_ID_ADPCM_IMA_WS: