From patchwork Sat Jun 22 15:31:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 50082 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1129041vqz; Sat, 22 Jun 2024 08:32:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXjJoWWGUpgQjrv6ixkGtW8vBtw0JyM2Eb8SfZaNzvFC/6euQLnAHa87dhUEyVbVgwYgXr5Z0U3OfrywIWI2rzjL2utUygOcyCgNg== X-Google-Smtp-Source: AGHT+IGXMok7zpCDwZ4gDLsV3Ak3FmS2+Y2xrfq7qy1iCQJKH5FdZwcMvt1CFKf9/V5zx4VRotCx X-Received: by 2002:a17:907:8dc6:b0:a6f:e25d:f6a4 with SMTP id a640c23a62f3a-a7245c642e5mr6822966b.76.1719070357924; Sat, 22 Jun 2024 08:32:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719070357; cv=none; d=google.com; s=arc-20160816; b=lwGHC2P8AsWn0OpS62BvHo11BQSGHa8QtGmgO6I8bbl7CZGTa+uMxtF35h3++o4GnF aUpZsXp1t87Os35yQ07ZN5+lQbTrQuFZTVJMSiG5uXSXU3AENMiOcC8x8x1hyIaU+JmJ EwX8pUhabRvXHVt2mOAhOUcA6gWVtN1km8XwxGtu4AoaYh9pns5F0Ckape+ttWQNlw+g thEiLfvBItT5a1GQChY2xCELxLvmbnetx2dRyDre51z/jsI1Xj0m5/5RCHLNy9qXl0Jg uRABPDF7K4gpoZLXLj53axTofdiSHvMOaMjfc9Nr6x6nJZua+Yy21K8ECLoZLOoNkozw v/Cg== 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=j8oX8SIXIKcNNuguXqDgiOnNR9YGvDydMYsgC52ELLk=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=gND6/hOXgmrd/eyWcR/dUZKa+J8bXaJnqte5mbRpezDOlmgV5OY2qsvJrHfMx67//2 BKbSsiOKEOjfCXNlGkw+qtYVDvIEh7NdHRI5gB7usG4coAD81Auu5YcQ/648Afxf94pg q3whgSxMWOqvpXI6qXpiOPFX+FwzY9PU7pQweLB9vhZu4W0izpgowLoRZYUkKBacAy/4 TSnNmnC4M01yuW6osrW4JpOgaapTAJ0xS/mIkrKLmhvoX/08ckkLkI/YI9rmIbWVOryx rWb21h1V6IaCSOkvpw73SjTJpa5u0Y5iNcnwyJwzcQrHbm5SGkvKe9jNOyR81qpdl1rU OugQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=gzokZYUC; 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 a640c23a62f3a-a6fcf54d5b9si188992266b.345.2024.06.22.08.32.37; Sat, 22 Jun 2024 08:32:37 -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=20230601 header.b=gzokZYUC; 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 6AB6268D673; Sat, 22 Jun 2024 18:31:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED39868D641 for ; Sat, 22 Jun 2024 18:31:42 +0300 (EEST) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-7065e2fe7d9so920597b3a.3 for ; Sat, 22 Jun 2024 08:31:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719070301; x=1719675101; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=3WHZ617zzThCSDoqMw1BEkjPuMhVKL7o5R5/x29PtHw=; b=gzokZYUCeG8sXih1iFppV9tCdmjcvoVSVxKGA1T0pYTvj89SvJ7CThK7Zh0VV/Kx7/ UFDYd043CPa5zu2VAZxxIRlR1ofXouODJ3VUf1Chj1ewrbTmwF7yj8JO33YwZU55sGz7 OlcjfNWt97T1nK4lELXk/OjvxG3EAeN8H79kSos3uB1fqrudY7iDQpCXQesksnaHzUVx 3wsEIniZwxfVIW1Q71gcJeO+y0oF7usp5oXg5vlkwdY/C/UwdU1H0I6XcwH8agA+FN1K 41TcRaOI12HB5YzPSF2dM7QFQeR3Bus2g/FI6InJo8rPnQJrAXkvmt4dArMi/Kxd9TQv trwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719070301; x=1719675101; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3WHZ617zzThCSDoqMw1BEkjPuMhVKL7o5R5/x29PtHw=; b=m2eY0no8h6HPnf6KewvlxDTFH0jAbivbc7te1CejbD3tldiFgFF7cUNW/QnStGkImk qAHu/cdskW7VYNSze+YKG+3SnCKJJNx3yVTbTfywpvrqAd7JdbEsg5Cb0T9ODOjdQ410 y0nRfTL98E3JlcWSQkJtgYw39LO/QidEJAOlDsg4hV9US6r2EiVxBWgPKQa5nZxdi2JW casiqo6RvqwwylN5zdu8gKWUFnAtG6hTsTqY4/mY34uw1ztuRGQUEClSvyJpVyoIcOBY UiWcy0wEriLK0GjwfsLLDljcCP0zCX34CQLCCz7CK11YA65JzbALBfsZQTE57/yINoCE I0vw== X-Gm-Message-State: AOJu0YyczHahz5BErFdKNXdF+PIpwQs0YRGbe2xQ0Lx2WLdCRm8R7qGp qYnJbfh3158kJrD6y7RW79sBe+W2sOpg47P1U+u7xP5Udh3ur4yIJ+S4Tw== X-Received: by 2002:a05:6a21:6d89:b0:1b5:d36a:5d68 with SMTP id adf61e73a8af0-1bcf7e76ec5mr159344637.15.1719070300766; Sat, 22 Jun 2024 08:31:40 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7066ac98fc9sm1164709b3a.193.2024.06.22.08.31.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jun 2024 08:31:40 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 12:31:22 -0300 Message-ID: <20240622153122.6220-8-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622153122.6220-1-jamrial@gmail.com> References: <20240622153122.6220-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 8/8 v2] avformat/matroskadec: don't use sizeof(AVStereo3D) 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: PPQaevGh4QWA It's not part of the libavutil ABI. Signed-off-by: James Almer --- libavformat/matroskadec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 6bc5fa621e..d1a135ed63 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2253,8 +2253,9 @@ static int mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mo STEREOMODE_STEREO3D_MAPPING(STEREO_MODE_CONV, NOTHING) }; AVStereo3D *stereo; + size_t size; - stereo = av_stereo3d_alloc(); + stereo = av_stereo3d_alloc_size(&size); if (!stereo) return AVERROR(ENOMEM); @@ -2262,7 +2263,7 @@ static int mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mo stereo->flags = stereo_mode_conv[stereo_mode].flags; if (!av_packet_side_data_add(&st->codecpar->coded_side_data, &st->codecpar->nb_coded_side_data, - AV_PKT_DATA_STEREO3D, stereo, sizeof(*stereo), 0)) { + AV_PKT_DATA_STEREO3D, stereo, size, 0)) { av_freep(&stereo); return AVERROR(ENOMEM); }