From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id CB2154BADE for ; Mon, 29 Dec 2025 19:06:37 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'zg3V6dXQH6PshDVi/uXRo+BmIIKybeFZYkNKNE9eVG8=', expected b'a32YYzgo5jUufhc7JWZXqY74g1JXQt7zz7DdytFk04w=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1767035189; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=zg3V6dXQH6PshDVi/uXRo+BmIIKybeFZYkNKNE9eVG8=; b=ptFgKyVanbITJ3iAWJK3KFkyQRPRgfAWynHXqist/rj9oq0KiSH3SF/esTGiL/zPiXVFu qK45fZ1NZTqWHZhwzq59WFXP9tC0i94hIyAYrRy6rD23DkvMGgXUqJXjG7Le9tzdMf9dlHQ GjEt0zKdlRES+4yaVzEFKvqTlRMDEfkE7H7EuPladI5q2mvY2XiRvijNpDo2NufMOKTylCv SNqSGReYnb7SyrYC3aT0ag42rVqSC9fDVjJbTmdFKS2wF+GrL+wv2qXCSMEBJoIpbU/R+0j AQH3nFaf0XFn636j5vVTwCu9dL6KC+baoYCEVyD7PQRnvRmsXNEkheREW+pQ== Received: from [172.20.0.4] (unknown [172.20.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 2EDC7690C76; Mon, 29 Dec 2025 21:06:29 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1767035174; b=SYtq69GVUr0rsKV3mriKI5Pm7UZYcoXrMLmXLvsMQwevLNQ4NHz8rcJtwnE+ZISvzrF2C F9sjffkmC+WOBihsfaHjcMqW5llHx6br3PKVcVjQxZ02FqZADht46D1kYsTFflX98bL5tb9 4RFAAcPcMXfJWANs30agjzumtr5u4j4OzZbD64iVJl0W44Z8+uirHptLYPr8FsTY3RpsOPE 4RSDsN7wy104OUlqWwtFZ05XaLUQGaX7fYYdG85ppizUHT6yMxai3yuYpEhNY/4HYdUzrRa TAYtXYPU3bySs/bT+JYgiQWBY536NKx2UlrRB3dIYKRKqc8+KtWF+2THJI1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1767035174; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=eILKLBJScw+xxI6SgobPiknLYyy0TzJouaVR7kstGEY=; b=bqeI6ETX9weZqvV6/lLp52kDsoel/he1nKZN2LzrakzI0SZVuhyIYbbWovcCt/OWSfoos kdygPmM4XgvpfVZnlWPdP92PRV3zvCbfH89D+/nqlPNXzWQvXHBnbqATOUyiOXOyZWUwGd2 WCSu2buQT1mIDHH9/LvL48/gw/x9rw6hi9eSnyN2ADrd4FZFBvm8Svz33rNk4pdv5KzrRlb 0r9Oxo1gHMe4mTC+6GiDqSzSClPmymURcVqiZn8ZCbnNhFqYHKIXS4gaaJHpYpRuwsADCQU bJ/ER1Ok9Hu6RUgTWLHiGt0UlNRm4RUXaZSETO2vgRkUgpkAWwY01yjTYVpA== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1767035167; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=a32YYzgo5jUufhc7JWZXqY74g1JXQt7zz7DdytFk04w=; b=y1ObZMxGC9u7iOIAVPSRycWkb5V7WJGO7RYdmoaWqMkACmoamr0DX2g83lCfsEWC4ba45 EknjvjLs6dcNr7vV1Ib9y03WEE5yej5xq9GdFlmVhwFZgjns6+wZzc6klVl0QCCWcHaMbgV ZMfPxDm3cEk+jMn83/EUbY9NVwWEyzm3P+0NGbQ+igSYkggxPsEtyByrijS8MnadVNQVoMO 1e8boO2XBYUYKRsgVNuU9y1ZLK2XUrFEU37HkCaCZfvXiF/ZwRih74bSbkg7LzeQyKp9Y2R CspkcZdzipwhh9oCSZK4nyw88FZgEQsj4dKL7SxN7231YfcgkKhgtPPSJthg== Received: from 55ca25703178 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 9883A690BF9 for ; Mon, 29 Dec 2025 21:06:07 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Dec 2025 19:06:07 -0000 Message-ID: <176703516778.25.12250619291729448710@4457048688e7> Message-ID-Hash: Z7HMEGQ4NBXNDLPGLAEBSK2V262ADUJP X-Message-ID-Hash: Z7HMEGQ4NBXNDLPGLAEBSK2V262ADUJP X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avutil/opt: fix av_opt_is_set_to_default() for array options with no default value (PR #21314) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: James Almer via ffmpeg-devel Cc: James Almer Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #21314 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21314 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21314.patch If `AVOptionArrayDef.def` is `NULL`, `av_opt_is_set_to_default` should return true when the field in the object is `NULL`. >>From fcdd5c49ed82c74f681fb6a2312c4a28206f6e55 Mon Sep 17 00:00:00 2001 From: James Almer Date: Mon, 29 Dec 2025 15:48:51 -0300 Subject: [PATCH 1/2] avutil/opt: fix av_opt_is_set_to_default() for array options with no default value If AVOptionArrayDef.def is NULL, av_opt_is_set_to_default() should return true when the field in the object is NULL. Signed-off-by: James Almer --- libavutil/opt.c | 2 ++ tests/ref/fate/opt | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index fc5834e168..911e064914 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -2602,6 +2602,8 @@ int av_opt_is_set_to_default(void *obj, const AVOption *o) ret = 0; else if (val) ret = !strcmp(val, def); + else + ret = 1; av_freep(&val); diff --git a/tests/ref/fate/opt b/tests/ref/fate/opt index 1f82f7e4bd..04e787f01d 100644 --- a/tests/ref/fate/opt +++ b/tests/ref/fate/opt @@ -86,7 +86,7 @@ name: bool2 default:0 error: name: bool3 default:1 error: name: dict1 default:1 error: name: dict2 default:0 error: -name: array_int default:0 error: +name: array_int default:1 error: name: array_str default:0 error: name:array_dict default:0 error: name: num default:1 error: @@ -117,7 +117,7 @@ name: bool2 default:1 error: name: bool3 default:1 error: name: dict1 default:1 error: name: dict2 default:1 error: -name: array_int default:0 error: +name: array_int default:1 error: name: array_str default:1 error: name:array_dict default:1 error: @@ -191,7 +191,7 @@ Setting entry with key 'array_int' to value '' Setting entry with key 'array_str' to value 'str0|str\|1|str\\2' Setting entry with key 'array_dict' to value 'k00=v\\\\00:k01=v\,01,k10=v\\=1\\:0' num=0,unum=2147483648,toggle=1,rational=1/1,string=default,escape=\\\=\,,flags=0x00000001,size=200x300,pix_fmt=0bgr,sample_fmt=s16,video_rate=25/1,duration=0.001,color=0xffc0cbff,cl=hexagonal,bin=62696E00,bin1=,bin2=,num64=4294967296,flt=0.333333,dbl=0.333333,bool1=auto,bool2=true,bool3=false,dict1=,dict2=happy\=\\:-),array_int=,array_str=str0|str\\|1|str\\\\2,array_dict=k00\=v\\\\\\\\00:k01\=v\\\,01\,k10\=v\\\\\=1\\\\:0 -child_num=0,flt=0.333333,dbl=0.333333,array_int= +child_num=0,flt=0.333333,dbl=0.333333 Testing av_set_options_string() Setting options string '' -- 2.49.1 >>From 83d3bd3e56edfa7b2ac8404ef9702a888e07999f Mon Sep 17 00:00:00 2001 From: James Almer Date: Mon, 29 Dec 2025 16:04:25 -0300 Subject: [PATCH 2/2] avutil/iamf: remove default value from demixing_matrix_def It's not required sice the previous commit, and fixes memleaks introduced by a6e5fa3fbb5562f14a666964b77cb7560e1a92cd. Signed-off-by: James Almer --- libavutil/iamf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/iamf.c b/libavutil/iamf.c index c18069220e..ea0c87428f 100644 --- a/libavutil/iamf.c +++ b/libavutil/iamf.c @@ -239,7 +239,7 @@ AVIAMFParamDefinition *av_iamf_param_definition_alloc(enum AVIAMFParamDefinition // // Audio Element // -static const AVOptionArrayDef demixing_matrix_def = { .def = "0|0", .size_max = (255 + 255) * 255, .sep = '|' }; +static const AVOptionArrayDef demixing_matrix_def = { .size_max = (255 + 255) * 255, .sep = '|' }; #undef OFFSET #define OFFSET(x) offsetof(AVIAMFLayer, x) -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org