From patchwork Sun Jul 28 10:25:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 50802 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:16f:b0:489:2eb3:e4c4 with SMTP id h47csp647886vqi; Sun, 28 Jul 2024 06:31:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVmX7fcUxrgAXJ59lKsVax059sgoqozs9mf8SMG8drI155KnbbtngRcf3ph3MDFfg1Xyaj2QpmV/yZA7VGHDCk3bUXQ4v+nyuA69Q== X-Google-Smtp-Source: AGHT+IGfY3bDWqEhoHcN16fODD/PTvOl01PYqor65Hu11TW8ZDMoDksY93cdqr0LfidMo3Urv1R5 X-Received: by 2002:ac2:5e2b:0:b0:52c:e091:66e4 with SMTP id 2adb3069b0e04-5309b2cac38mr4290991e87.44.1722173516812; Sun, 28 Jul 2024 06:31:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722173516; cv=none; d=google.com; s=arc-20160816; b=joOtU0dvuvw0MZTdhmsnZyjAaZrjFINld7J7/yW/Vpkxg0QIVzaC062D0g0s5ZFWB7 HdbQYJTctfb0AygVX1dxF8Sucgt4APiYVANMXcQla5fS9hDt7WOrltL/MSH4iapQcG+T nLw6xcinPdFdMU+7hYLkNTZeX+PNU4ckMmKvDp6XIVCYR94ep7ddYHnvFCvPWgDfITti bANd4v86RkeeMXDtVA/42hHISpvmThlTIg6tsB9ouBZ3iE0ix3Cfv14fYTg/rcXNDoal OUt/zHaSwGfm+/24nOsXSzfMYQsGYkiIFOwJZDf3Y8st8MydIaWSEROlRXaRIrLBk0q6 aCvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=R2cjUtn1f93E2zIgVNPHhtUDFkxRaXr1j1Y+0RTZqJA=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=lEV27a4u8ua7bnT/AO9pSXGNOZET6aQSrKqOvQ4PLPPOGJwzsG6MaFfNgyxiaVMH0E cDRBlMN/2bzK2g3M3ZBHLUUCzeZvdnhsPQPo1nhb1Z6hiJ10CntIPR5jYVhuzp2c2RC7 Non0r+bKlVLXMFsCuI68lzYA9HCLqO7uBJwdzJyl/keE+DAPUSqKKBj7lMenvZP/Nf/4 DAdN98pUe/4rF1OyKh5xSG3YJfJxlMhHb2mzoUFw+96VeC9iYwEv0nJ8MBLqiZIwnKCf lIZZoxRV2G5AJTYMkiL7H/5vtqBlWlmsuzPoHIgdS1uehW4fkFAsul6EH4XGuWVp1JOg m5mA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=mrkObkUA; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2f03d13e984si19658571fa.293.2024.07.28.06.31.55; Sun, 28 Jul 2024 06:31:56 -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=@haasn.xyz header.s=mail header.b=mrkObkUA; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AD1F468D8BE; Sun, 28 Jul 2024 13:25:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C8AE568D73C for ; Sun, 28 Jul 2024 13:25:41 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1722162338; bh=gHaNSPySoeerwJBB+7iEyEOLNqHAewC1EBE/sfkceKM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mrkObkUAGGl12P8VxGZSWqymwkV0W0m0tksQmyT7djne0ZviKxUuSS+NVS5sJAcJl knMZ/DsJ2rjyQthxi/KS24OEPE8kPx0CjaRna1pF1rJukZnn6hier2Oj61AOJ8uNMI HsDsDEjO8q14JGSB3RzgoYddqHh0+Y143J9WX/9I= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 69E2643420; Sun, 28 Jul 2024 12:25:38 +0200 (CEST) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Jul 2024 12:25:20 +0200 Message-ID: <20240728102527.17991-15-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240728102527.17991-1-ffmpeg@haasn.xyz> References: <20240728102527.17991-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 15/22] avcodec/dovi_rpudec: don't unnecessarily allocate DOVIExt 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 Cc: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HZSPop5HkAFc From: Niklas Haas --- libavcodec/dovi_rpudec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dovi_rpudec.c b/libavcodec/dovi_rpudec.c index 6ef7a88ffd..3465665961 100644 --- a/libavcodec/dovi_rpudec.c +++ b/libavcodec/dovi_rpudec.c @@ -289,7 +289,7 @@ static int parse_ext_blocks(DOVIContext *s, GetBitContext *gb, int ver) num_ext_blocks = get_ue_golomb_31(gb); align_get_bits(gb); - if (!ext) { + if (num_ext_blocks && !ext) { ext = s->ext_blocks = ff_refstruct_allocz(sizeof(*s->ext_blocks)); if (!ext) return AVERROR(ENOMEM);