From patchwork Mon Jun 7 03:42:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 28122 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp3147071iof; Sun, 6 Jun 2021 20:43:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx6vanvant+r1ZFGFo46cwsal805yRg/ACySXSuit+y/izBTGqlgqM2e7+yqgyZsRpGID/c X-Received: by 2002:a17:906:7f07:: with SMTP id d7mr15759685ejr.240.1623037415331; Sun, 06 Jun 2021 20:43:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623037415; cv=none; d=google.com; s=arc-20160816; b=DO1lRmNeQVdr+TYwlVq2zumhyj2jdj09pF8PM1eO02gODZL8syw6pBSzL0uqJFbsFB WiKkIo1OfAHPqqAJ/a07QvK8UlPVsY86YohvG3zbMQckGkDti/J3hIBNOvBV0CY4IdAG C+X0RjZ33ah8F7SiN83m7sXs2BDHytMtjpGHkYoqh4R4ecHNvoYy/aXrma2idapNIyLD WPVP3htKm68YvbOyU6aU6om2cShUbs94vFbBvs65H9pY10oEROM/qgkrOyoygXyEoMPS CfRai6q3Mv/JwU2AKAo19f5VWAgoEP41iwFzI1InBO2RTnNnieYL3P5PAT1bUXyqm9c+ H1eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=wODUBU7Et4HwzwkXWvKlN6DkKDYUkEl7C97GB8l2CWA=; b=I5E88+BOCZ1rblaJMS1mTKmGXBvuo+7NgS9WjQ/e40XWvifvGrO8ePIDnRp6ntOoDI QuiX5Ma9b42DoAFgjqow8NX1YnQf20kR65saqXV9KRSWKMXPoeFVHThujQ/VYf4FXKl6 AkSjm35wxF6qhYo0noNM9EzXgo+WNBeh6l8KgeIUPTfFcX8Ga9LHnfBQNT50pY6lTbGv LiAGyjnOUUNvFo0E6I5O1jHY/0NCBYb7NGCXS1bWIS91ly1zvxpuzFcnO+yYygDJgB5l kM7yyivkUP3PL1PqOTR9o0bjTr8jCsppM5mz8Bi3C7HWGVvOG79pYVSYZq9ul3o30Ypz dbTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=RD+uPXyO; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id da25si11342085edb.3.2021.06.06.20.43.34; Sun, 06 Jun 2021 20:43:35 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=RD+uPXyO; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 02EC06899A2; Mon, 7 Jun 2021 06:43:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D630E689966 for ; Mon, 7 Jun 2021 06:43:14 +0300 (EEST) Received: by mail-qt1-f172.google.com with SMTP id l17so7541119qtq.12 for ; Sun, 06 Jun 2021 20:43:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=VjGMY6FTI6kkeRBBP3+Yw3PTNq7qjN7Na6LS2kKc2R4=; b=RD+uPXyOho/9Mqo5YjOW2m/kbTr3/NNz+EZOoUjTXROXAKQdwT5BFd1dEw6M5DTLrz DirMqgfxn8yPyl7xV9tBW0H3NVe2nCyO4GQ5FlgnbsjuXJ20AArbTyq/NSfq2eKVv3YO aUeydaqgSAMhFa+VBMz0TrQbFgMSWtdY3CtQRkr9wcnMkWsDxJkWk050wde0HmkKQesq fObBNYQs0ynP+hLHZiDEdi6tM2wUKddTujgP5J161k8+3mlHeywhnK6XARyzqUNpbBny FRfvY6TIion6cN/favXb9/ZfmZOlJwUUgbXQeHRzwGKlVmkH2rH0v3587y7uVi8rS8xP VXyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VjGMY6FTI6kkeRBBP3+Yw3PTNq7qjN7Na6LS2kKc2R4=; b=XxsyJZysohzRQtuSm6iH2GIqYoTiaNYFXSQzIRcj67B+PLEAXQILO0nf6/jCo7G8HS iN3rF3pzMH0/LJcQCsL5wzZBFLBVGEcTsWqHBuelxKUph0PseKTO66wXF8NZwTNW7zwu Z3c3DDd7IxhA3xtB+GwcTCAeGx7apArBHDKs3BiiYAHLWQCE5U8UympyCSxWmYqd+V7p PRlYLfi1AFHBCERB4aJoXoAeDBdlrI23Jqaj0V0X6r3IGnlm4W5U9/E+u4UiY2z/TsUl PTX01m+l1ibahNi6x9UYMHh9JNNH4SBzsMdR91Qw+U/Ow0dw4IQ8FDjLxeH7RQKXsVHL fSYw== X-Gm-Message-State: AOAM531aC87C8z+oDHXFm2//k1yq5coFg117j1RBXqpXKsN+MZP4XN58 aMJs0PjaXlocTwtHbEIUluwz+BXVDTU= X-Received: by 2002:ac8:60d:: with SMTP id d13mr14920694qth.223.1623037392774; Sun, 06 Jun 2021 20:43:12 -0700 (PDT) Received: from localhost.localdomain ([191.84.230.84]) by smtp.gmail.com with ESMTPSA id d16sm8037772qtj.69.2021.06.06.20.43.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Jun 2021 20:43:12 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Jun 2021 00:42:16 -0300 Message-Id: <20210607034216.2862-2-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210607034216.2862-1-jamrial@gmail.com> References: <20210607034216.2862-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avutil/samplefmt: don't add offsets to NULL pointers X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gEdA9Ss9w9D2 Signed-off-by: James Almer --- libavutil/samplefmt.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c index fc077f6444..c7428940e1 100644 --- a/libavutil/samplefmt.c +++ b/libavutil/samplefmt.c @@ -160,13 +160,20 @@ int av_samples_fill_arrays(uint8_t **audio_data, int *linesize, if (buf_size < 0) return buf_size; + if (linesize) + *linesize = line_size; + + memset(audio_data, 0, planar + ? sizeof(*audio_data) * nb_channels + : sizeof(*audio_data)); + + if (!buf) + return buf_size; + audio_data[0] = (uint8_t *)buf; for (ch = 1; planar && ch < nb_channels; ch++) audio_data[ch] = audio_data[ch-1] + line_size; - if (linesize) - *linesize = line_size; - return buf_size; }