From patchwork Sun Feb 4 16:54:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46020 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp313995pzh; Sun, 4 Feb 2024 08:52:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IFuEHRs0ucXn1jMIufQxD5sb86c4nh0uXVtkMZnYFwSdk/PqDTnrQ3ww7HlOKgDZts4D1o8 X-Received: by 2002:a17:906:5a92:b0:a37:9644:3d0b with SMTP id l18-20020a1709065a9200b00a3796443d0bmr1176726ejq.2.1707065579637; Sun, 04 Feb 2024 08:52:59 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWTTUtGqj0dOy8r7iOX/Ri3Fr5VnmkJm/jfeWp0DuHCm18dAfOnLj49nBi4GFlwtaSKYPLrl6AVd0/OVIrR7iy+CW5jo1KdurofEOZ17rSjbHDmPc/xb0g6K1CtWWm4/6BtH4HO4J7If37rthCcngk72ArezsW/WV3oinwWvqUJG6LIZo1eHWIdXbZwnIDBqSftf+tul7w51rZ9SBMSUAFBjAQPCO8JBjeWhFtCQfDIIYGu3eJ0lbeW61Yp4014P+LWyiggfHJkT2DFrScYL+seQwBbPUelj8SBMvlS6CP9lDTsuNeR7cRZJxaBZasF2rKQKPpOwZg7UOTtkVoOCiTBvXVIRge0mBu0Bh0CK+KUQwPfjV57YGzo9be9TeRVmTsein/ShoFfl2Xlh+J3BV8R5+0q8CvbeHmCy6wbBFq4QkHzyv8ttdi6C5bDTIrzA6Pwe9AiXayx+NQamJDpAN6NZdbor4/YjSCH5txESB3a8DHAa2FJ2nniy1t0kroIdrFFuKXLBn+lG4obB5dxd1G4NKNYnK59BsOJhC6cWlMskvTJH0W4QXfiXPA28u7rvVmeL1dZoAU389WtKObRcwH+WoR81fMv0aJxQHmhusiPno14yI9Z+9PIp6diA+EXIxcynw7QZgxmFlOtLJcHlf17kSXJnQXEyBKxvpU5X2Al3/b4ZH0m+DohWFS9SL19xPyjW88bT+3gENYu6R9yTepsVsQFliUh3s/fRmz85zyfRom2KYRFpAx2fMrtUsJ6N0wuy2TWAXjYovPCCrcCUP4kx9dYU1ZtN8WYp3DimcDEvX5o65B7UFB0zBdLMuxUpqqaQ9wn9GRcmf1OOtFepy9XudL+KTX2gjOeY1tE1Yq9cz9uBsaLLcMDgDxEYXl0agxkVtpNyq1vuXx28eIPlYNRCKoDDKzcZYO4lr0NfV8ikhJ/Nb3xvo5IxlHusq/Cz0yDzh LDrckaC6RHaM37c9rB1lu360gC+tC1vJQUAH5cCw0su+ld4iH/lgTwHVTV1HF0JEKr6cwHg36E0qyv2Vugu9J2SGm489uWHYIx/W04zHN3rO448sZ8QPWSoQuwNKaQQGF5jVDsifwRKxp1RKuyxweHrnrzb314h/Mcr0jHy/YX0QJQpUGTuROMdQUzwMKQC9doN9o6jvng9CaCAWQ/rNyp9shqzjMjIc7GEX61+7pT3v/nn3addLkR5/MC9y1J/Y2y9DiApqEasfhgqt9ju+ODF6rKNBytI8cQP9Q8z8q5k+6rtt45fn89yrM5SsAg70Z1qiDdo2sbtE1ssMQgtKyJdXpcogMCYw+e43kzSQPe/wyu1Qrcy5qAn1tGGYzz0CPFqc5sd/5/pB3AtSDkap+2QRH90p5JH0fnlL6Zeyy27TdjLMvw26/ChQbFuzHAaMQknqryZuXf0KJ/yWi8GAynRobly/a6cjcUi6AF9zERbW9qhTm7qttQUnPQXOaC+1PBAb16SzUfOakDWnw1Fg0L06oNTBqVCcHJtaDEcCBXdEjdWxFGYzf1ISuK4uxYj+LrJw5uNTQGyNYAzkcVWrBvDsfGlu/hMp1w8qhxUMU5CfT32bTmPBxsco8IAt2m/nXIm1Qa/R401QTJWTZhKA== Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f22-20020a170906049600b00a34b006694dsi2997325eja.318.2024.02.04.08.52.59; Sun, 04 Feb 2024 08:52:59 -0800 (PST) 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=@outlook.com header.s=selector1 header.b="lprrpt/B"; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E0A8768D0B4; Sun, 4 Feb 2024 18:52:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2036.outbound.protection.outlook.com [40.92.75.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5DDC168CAAB for ; Sun, 4 Feb 2024 18:52:49 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a3SLeFAbZDYz+4Y4xcOkOlvNfBaWvFBA3xxieXHwXhh4hq5RNzqDHTU4rmD2jmjMAA7Da3rl0ONpF0afRymyrrPXZZf5xHr5r5WYAgvwjyDBmJa++kWH0wfnSEVCHzAVK9pw9w0EeOyNqv9zaPwpTnSYsAGKdVBA34FVfZTV/N+b8ANaG6N9t2yys9/J3HfQ477yFIxYVZGeefhTGxUcs2DpwampnwbnpZdyY/wD3BB+PawvYwzzcFSZiUwm1AnZ9cHKMko8+yAeeJAXx+z2sT1edxZ5fCmE6Xds3CzccUySba2OQ2A1YGMAEkAWWdiZ7STCOQcwJAHHj3lyGzzbHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=sYlcIPqBE5WMwWPa0r5aAIwPXtyobtaGF8YHnefDtBQ=; b=HSPFwk27pHybQ3M8tvcUdyLnidcwLmG2YNQWxf5smXSujjJ423IvKUOAOeJFKs+xzao0mM0bSa2QnVDVl/S0Wwx/81A+HLcSlaeyC0dCLwQKYe/x//o9xw4zalDKPzOy2JWr/H4KkE1ObzGjvkBrKIHyLo7VUikX/Be6wp40pqhtlkqJ7LqwYtpkYynfL60Mnnc9s4c7qnTIE87+ACmX2Q0Jow4BCQWlNm8FilA8Qarwqjz2oilweoMo2DczfjgG0qt8AxNsFSDmgbMIno/m9EyHepXkKwtZHm2Df77ov4qQDnuZaffTUVd2++M5gNzv17L9uZB48W0IqNrZekiCxA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sYlcIPqBE5WMwWPa0r5aAIwPXtyobtaGF8YHnefDtBQ=; b=lprrpt/Bgh1Yj/UTsTL7ktzlFD+CF+QDLPshN5BaYEoIKJBxT7BmThUB/NrNXI/gdj3tW4NR02ewg0a38F3Do0c35AWrztvy2JFYFF0RrVTNcNYgEJG38vqwnDz7zso3NcJAOhMj1eTt32ZKyw3BOjJVml8Zj6uGOHvYsY/J1XBs4+9ObHlskWHX74IK/LJJSBo6Rkch5lPSD96vLR053BrnQP1R6dLwerM9f11xsDloTm4zzbHu0Ddqp6N86vCnPvW4aLK411U6zM473gGBgf42DBiFXxJl/vY+VdcBzd8MO3E/jn1G0DBe0+NB6gRGPdzHG0FXb6yrd8V6jrpW0A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB0409.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:329::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.33; Sun, 4 Feb 2024 16:52:47 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7202.031; Sun, 4 Feb 2024 16:52:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 4 Feb 2024 17:54:35 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [fFf7yV9UmdhpS7wgp4es2VpAadrrmQQhm198bdA/5Yc=] X-ClientProxiedBy: ZR2P278CA0021.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240204165435.2802281-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU0P250MB0409:EE_ X-MS-Office365-Filtering-Correlation-Id: 9d81b2c8-d19f-491d-9d61-08dc25a1b71a X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WujRZrskuo6QmXnHeGA8UVHjn9fhWcJOHU42VW5MMkB0PjZ0DWa48bj36Hn/gcaRbdKX131A0OFpvNnK0pje/bTyQCuAkp19lVrcP1iH36NlboDe4HYd3+uqI1kOHkP162mLvHtL6sMM33BwkpqdGG9aiJusf0fDAScZJ82pfPeGIn8x4cm4qAtlcS+R2clSm4NywQL/TzS/OsRW/oQn2MdXYxWLTqzY5+naCYYx11RLJlFUe7h2j/394cwEUz9pNPc+0/Z/HT3J4A7r4KuKPt8iQ3m54C7BuAGSb6OaNFbEXrZLbQCPvloywdtZPNhBTAVh/IBJVO/qbIc088ZK36zKwC/OXImOfAS2Ck6aS0IT8jBODTOevOiAzw92Pxh7sK1cAi66x0LfkIQrDJskZ+WN6h4yOkiq3u39LrErpe35inGbjqkEGdbClPfJCtX97EepBdzPXtB4Y/sg3znwI9GSuqXRGG1t8k2UYHmQfmMRk/F++zBH9BYi5UuFaTpZUJJXaRp0hkfok2ag+0XMJoW04YsazMP44PdwQu/msilAgK+Kh8TLfHGGSnf2WO3ynPIshULNh1va8HUS3YM+5gD9i72G29Djhs7NCeevOq3VrHwgB4hLF8+O8uBmJawH X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QJuOizRhGx9cKhR9jYO3hZyG+vgHyD+n84GxxaW/SLqvSccncVkIDVVxCuHSyRIVJI7l1rUalPDcRi/wX6ShANhNwC+4OBo6MHHduNA8ep3Yz9Spj/9oTKTSquyePlVCaGlTjaxNOwYx9M8Dcd1e+h0lzA3JOSYkqCV8MYnkeTV+g5iPB+xmjaWZbeckecRnzTfdACs9VkAml+f7b2YtrYEv3uBSBdAeoVC6ygRmW/nUQPOD57DTHpooTbZzOF4cx/zwxImSkmZqSWGASfQoN6uxHc0xh7L8I05gfFCf0qBUezcK+yJsm/5S5yhTywXSMN4GJkV0lRkXGiwRyLCE3mwhKY6tdr1HKyzz/XZSF/BCpJyyeLs2kXMLZty4G5UNMG1Tuo9v6IBlUmWMghc4ioZ2k8J2dEh5xjON9mmdeulg9GXxOPA8YoXJwn3Iz1Uz2XdEGKV+FKumY8MTO3dxtWzO8/T8GhM6gKGdIT1hfdgGKlwqQ0aUzYcjLeB2Ek8bsd4+teK+FL80EeqjgF3xI7bn8jnwbywRUxeKC6WwBcyi4rpp833yTwtqQpqcURdW146MTQ/tLNrMK554+ms2jII+2dKkkNyLvnD/ALErAWutEejkwj+aCEfiS8HnX10cD2Nc9jD3qZXuoH9OJAdvMN0MvpDwuwPgvN90Ggp60N5sb+ae7FbudTqgxGej+hRnI4+dI1khjXJcuUiKX4t66MzqQ/R7+isJ0HYSXxaZtQf2ouxJ9QJyAOQBSHrbl3ThT3RNjbQ7RefBIUMoJFJWbazfUr/8ipBiNyYFwnL55HHlxoj+Dx/QmAVU7GEsjyHPZD0+R1S/HqYjkxtzFsqEL5Y7eDdKzdM3XgiG6G1a35s7m8xTjhSsoz7BDj+06UQEqxlZlnbOoXBRqqkQVGoBKqDOa8zW3ZebQLqVx5ALUKjPsTxh146X8VBouzOQ8gbE+mI/rfm0VRM3WcCk8JAAkhVEndeRi6QRMtuSB6GxUa31Mfbes+dh4tr/ZWtjqKQQWnxwFjXuTuwpQ1pIEBb+/R0NQcdIocLQK3Vn450o4SJv5tXpwAVJMeQAj0p9R4F9cNwNJlxd9l1ekXhW3+32JoSxR3qwKPN/IYtick3e6d3p/caURquV1f1aCze2jXvyrhscR/Mf4BKXOjMUdf8syj2fv7cj3OPmfMkM4bI5wLGO6usWFOg31kTVJFtbX9H9jFq5ECDIoPov8iKC6tYLZyV5Iuzmwn5f6PVGSHH17oChbhPa+oVZO8qeGEEj1w8Z X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9d81b2c8-d19f-491d-9d61-08dc25a1b71a X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2024 16:52:47.3841 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0P250MB0409 Subject: [FFmpeg-devel] [PATCH] avutil/opt: Fix AV_OPT_TYPE_CONST default value 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: aNP/XnoeYyj/ It uses the int64_t instead of the double member. (This code can currently not be reached: av_opt_get() calls av_opt_find2() with NULL as unit in which case AV_OPT_TYPE_CONST options are never returned, leading av_opt_get() to always return AVERROR_OPTION_NOT_FOUND when searching for AV_OPT_TYPE_CONST*. For the same reason the code read_number() will never be called from get_number() when searching for an option of type AV_OPT_TYPE_CONST. The other callers of read_number() also only call it with types other than AV_OPT_TYPE_CONST.) Signed-off-by: Andreas Rheinhardt --- libavutil/opt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 0908751752..d13b1ab504 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -93,7 +93,7 @@ FF_ENABLE_DEPRECATION_WARNINGS *den = ((AVRational *)dst)->den; return 0; case AV_OPT_TYPE_CONST: - *num = o->default_val.dbl; + *intnum = o->default_val.i64; return 0; } return AVERROR(EINVAL); @@ -878,7 +878,7 @@ int av_opt_get(void *obj, const char *name, int search_flags, uint8_t **out_val) ret = snprintf(buf, sizeof(buf), "%d/%d", ((AVRational *)dst)->num, ((AVRational *)dst)->den); break; case AV_OPT_TYPE_CONST: - ret = snprintf(buf, sizeof(buf), "%f", o->default_val.dbl); + ret = snprintf(buf, sizeof(buf), "%"PRId64, o->default_val.i64); break; case AV_OPT_TYPE_STRING: if (*(uint8_t **)dst) {