From patchwork Thu Feb 22 00:30:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46423 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:26a3:b0:19e:cdac:8cce with SMTP id h35csp39723pze; Wed, 21 Feb 2024 16:28:51 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXehq/7cfkCUp8psY1jYzzNJ343dXrhmZHLSnwFxhqW8kjvFtPd3QSXFxdXJ7obtnN8IgE/n7LmLW3sX6XrhQlExbFa9w7WDULH8Q== X-Google-Smtp-Source: AGHT+IFhYZV/0xcEc39cQGx9Sm4AnrnwaNQquF9/Wz/YCt0wAfOk/IG+mAVDbadFA8SfhrXlkxOa X-Received: by 2002:aa7:d686:0:b0:564:ee23:35c8 with SMTP id d6-20020aa7d686000000b00564ee2335c8mr2550898edr.11.1708561731650; Wed, 21 Feb 2024 16:28:51 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t29-20020a508d5d000000b005645a23547csi3792415edt.560.2024.02.21.16.28.30; Wed, 21 Feb 2024 16:28:51 -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=Zkf3Ecz+; 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 0B36168D1A8; Thu, 22 Feb 2024 02:28:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2017.outbound.protection.outlook.com [40.92.49.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B43C168D008 for ; Thu, 22 Feb 2024 02:28:20 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VmEyQuDmLhXvwEFTLBpmipqmZ6kHFxS6+Si6t02t2ZrzOrESGCaNla1BM4qwSWopw67dUs2X1r0EKpE/E9YT1Cme44bzeCYpTLkvXOvepQ9X6DQxMsR+Zuv/336yoi1SszoEPeqxq8bgi2Q6uVu+OnTl2rRhv9JdyMD4u4tgLgF9NCWfpiwJTF5ktMdicyWciqv8QIZKIap/Papjjs88J8KgWvYIoOifMf7otYZEYkDj9J08z6Y5C7mHNqYsOA3H36SI6dUhJ1e4FTBa1sK7qV4jjvBuD3a1VYFaAYRvZeaHAfUi5X0s1lGzkPxbBL+PzHeJOdvkFcveHLO4zn5yOA== 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=YzXnW+KfWr4+KSZAZrBgGcaSj07GlW2KfTCgDlihDu0=; b=IuYH2amX5zMkQFZ16TC6jSleYm/7rflqMRux3eOqtqBWVAY3vTWXIG2T6R5U8O1006ROP+0NIn1n+PK80SBMKYpUJmso5k8aFheaFMCa7ZGyEQcN7S0z1emQNMbakD0siB60cyvynrfUkMt3vrpOG9PSIclvBnIbEhD2a6nJGZo1rqqZsiEMmj7J5T/ZLbkc9HiWnXw88PY0SW24JSG3fu3H+T+n5Vi/k9pnZZGxiyE43Y92EHylP28tGBWOXi0JX+lQ0kbH9xFYgYvWCCrpsJLu/tt7hi71v0BduU23V3/4MTLemP8efjN4eG+rydbzVV9DyLmVXZ12ON2yNJxCsg== 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=YzXnW+KfWr4+KSZAZrBgGcaSj07GlW2KfTCgDlihDu0=; b=Zkf3Ecz+79TgNPTeSw6+7+og9dA7cTVSNUzAS8sxZoDnlLX2DvEOmW+PY5FqRiPCx0sJuM7fMcwtQXHIWB5ruly7qFbjoaxRk4oq1Rbnn4vIsaUK35vZaV4qwq8froGfnCjy/7NeVMcAxqirsWPl511QIoUjTTfbXX3VdEm6EFXRHLnelrlBMGN0JXpXT3TQoauY0V9G7LuiZBC5NFA92n4cY/JvDCwaLEvDgsOCVqccaYArSJnKzbGpyr0pBwzZ32EUCJXK7IFsilxrMzY7SCAGuICk5ohPM6+4IjdpYiAFXXvFsEoBaYTe+NMaz9Fn8ZCyYNJQnXJDsvBs/2Pt9A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0271.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:270::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.22; Thu, 22 Feb 2024 00:28:19 +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.7292.033; Thu, 22 Feb 2024 00:28:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Feb 2024 01:30:08 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [HKqJ5H4vfG0FpV3vwGpPoueT6D1FyhaxMEsxDPMq12A=] X-ClientProxiedBy: ZR0P278CA0167.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::15) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240222003011.2023361-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0271:EE_ X-MS-Office365-Filtering-Correlation-Id: e360e128-b2b0-4cc5-5b50-08dc333d2b0b X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnoD9KdWYVDMKjjxPyiu4b2HZlmmRo/87H81AqtuhnBew1JpfPEQSn/utueIHp8yz6hUt51oJQ4RVY2nNPoX14MeQ6DibJkXwrT5ENOGMy6+nlySmsbR1T7Dta4qJjzgHCDTaoXBwP5hXpzpquhcU0UCRURIoeKdSbBpVz15pV4pyFkV7BEfwDGTs6NUSZuSt84/VAT6KScyiZpVU4D/YklscZY4vjLkn/GR4h470WhxP5UulmVV/n2z4rqBNjbvrJOwBgNKfQFX4Q9/GkLZuJ9wh0qDFrsu9B54HWYpAEdPyYmMfJnpsZJYUjn7ly7keiAnIcMRKlSLjcVBg5GDpCgUrL8SX7SDX5oylYgJfzLrdMWtkkC/UyXbxOexL5R7isSXAgBVzj53n26fnr/G9DtWy3QQ8XGl9xMUCDX//nfIsbGqPn2J3SMFf8ayx3ijoi/2rUJ0fH877r6s11CPNqKSrQc/lFoPp8kFF5wz1C6w3j7JodGR4rB7OpgYy5QhLeYsWllgm5wuDc0cc7+LOghArftk2YAYdEWL9/6Ejg21DhPypjrnehtrXH7niXV3ekJimIiv5M011AbQb3O2l4C/TmUcE2nw8WUJrJDCB7c7gtPBtPgBPnGteboJzUDtw6jFRAL0tOpWkDkm6kItX0i/g1K71jNwg8f/PsBxFaltRInDrkkWgDYChe2PtoHYyNuDgIhi+wzhdQqPJu4eLpqFJlQqFX1YlMoCTpF/gvbaglQ1YmGsUuf3P0Tfekw6dqI= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fBHZVPm5uTJxikbQVuKJEU04SZL03PQRiYDN5QRIMNfFNbo8pK0GJWhaQGm5asw/HcET2Bav4oje9/z7UT8oXfZXF4zt/S6Nf7HIdJeLj+dqHXH+NGJHAzqNRomKYMqelPCTtoP4yxk5dEdY3rsqNhaOv4ZAUTuQ9feW8G6eBSxCoJeqKw+Qw0dHlSuHBWmXUdW+K2qFSMU8RORT6GT9yPTJoXAn4fDwnsutnCJ88UBIXzaTMDSraXGdqsjJdGbX8eQo6wzU1DDUWIVtYwV2AeZOKqsS6TqRXYQPHrWQXb2X4gdPInSOlf+IclGubRjaz03wqYsJiibeV/CTfLm4ygSmX2NtX+pKIHvMR7g/KfuIbOZSruPZRXLnp+Dfdo4W5aVzLQG4vb5Gaz8q5onF8krtYnwPeki3rUei9lnWxUsCbPQLCCuSFjnBPuMiIM7r4Cl10O+W275kgUQhheh/2o0v1Y/CLDKU8fpnauEE34BRHyUvExIaZJ2rOI8I0xYqjWt6eK0EL+UioxDLW8T2ZZ5hXXZBsCg/XPQI5H9yVxQWLVvS1GXug0yRfJBtX3gG5DLpNXi9rohqygQrGRJFzoEALHXRSH6VoO6QA8wbiq4= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UtTSPn1UYiq+p2hawc3TIm5fvMZ4xYcYSsLaty144UodqzNTauoXKgWhdOwT5Lv8HGNt3ROcK9V7e2kiy8kRPH+B+n7LXpA8Ae1kNnji/am0Ygtkbrd3N+6zSU9Qt5PUzfCgyNlVV7hYT6UPIHBIohoeTgrGYsZqKcByG3KlqtcHjkP3G+333xAzpQeZ0JIRBMucwiwN1/Xi2G8RV9uZ8mYLctfVxuktd00Rj6pPFA4nUVcn9FXrEvg9H10JzM5SIGQmOk4AKC2ieuqWMoYrhY+3wKGMD3iRPDiFpIMzwfet0KAMVGfkGq46s2U8+ZO44N9S9se5xlCjd+JAgiVosUey+f6cCe5gTuDecSX30hcnCUZQlLa+N6vZEsRlTjYzs5V3mLgovrqvOAQrl3Z2VnJYrB2CikHo7ySU5MjUAM1BFhOpigFIbGCPbQY5QWgUN9X9q/P1depCejpkQ1PX5edz4ZHDLqwZLbVIZeJk0F8Lyn4LY3VBJDxBjJR787WllUKbZu6Y6QOKw4M0luCDg3YlUvFF2dRYhkC1NcF0Lf8V4rBggYHVVKP0TFcBoLyrF8uNU2IF5zCFgLVbdACmWCUmGIqAZ5YikMA3l5THsAK2iG6oQudGekcJ4auGZU0LFHKwlFGm3/knd97HofJtIZb3dgc6mzxXDqe/pfnVYe2BCPcIyImnmRlCTzdXMlXrdqfBsC986jk5SDH+2XPTBMTWoOyZzijmQJzG/jiEGU7rBX8pJl5kjShpFh5nJnlPOGVK4U+uNEohAXdVpf89W7ogoAJ56e9m5nJmb3zvq5XwQCMcIydjM6pf0IQa1CeWdEON3kH5ZU8vi3hkQws/HJ1gYScUwMkNQh+HdPzQBhR2hmAgoOpMTFV2vOPabdb8jtOA+APp9vVSvRwy5kRfV9kW9ryaN5Ex1DnSmGvEn0xv4/Q+KTI0EllLmIfHdDBzmMOHEaxUO+VCHGK1m2LlF7eqz5WhFxsmjhziOFORjISMjhpqkAvVQ0m/3bN9K3WWkKL7Mi08idwbRiyMR6gceE8V7YrAl5TmngSgNufWFODqUdodKhVGlnYLld7p65mUaXVJb6nPmtgCQKVg7rKnAVywkIkjHgnkv2Qeugxu5hunBsbL3h+W9YsUVKlqlzUD7Jhwn1FkPTWpZxROZHEPQ08mITi0lgIuA4myZY0goD8E5VIuiYJEM0vCmz+whMB85dUty9kIrIOPi9gMUuZc8y1TyyOmL27hOQVatvdbfuC3tyMCn7i99MidqYih+EI4coac1OI7Zeu6Yu926kQj6Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e360e128-b2b0-4cc5-5b50-08dc333d2b0b X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2024 00:28:19.0044 (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: DU2P250MB0271 Subject: [FFmpeg-devel] [PATCH 1/4] fftools/ffprobe: Don't cast const away needlessly 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: ev5Ms1/RObiU Signed-off-by: Andreas Rheinhardt --- fftools/ffprobe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index aa1153e709..95643f9a23 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -789,7 +789,7 @@ static inline int validate_string(WriterContext *wctx, char **dstp, const char * av_bprint_init(&dstbuf, 0, AV_BPRINT_SIZE_UNLIMITED); endp = src + strlen(src); - for (p = (uint8_t *)src; *p;) { + for (p = src; *p;) { uint32_t code; int invalid = 0; const uint8_t *p0 = p; From patchwork Thu Feb 22 00:33:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46426 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:26a3:b0:19e:cdac:8cce with SMTP id h35csp48196pze; Wed, 21 Feb 2024 16:52:56 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUpTs3bndvtXPU5c9N/RcSXRs9bRDZ7s0U7/+KQxh3/T2kXzpunVgN6MCg4XXvteDVg7USfij5eIN0C8ipQ+3pAJawfv/66RulsBg== X-Google-Smtp-Source: AGHT+IGxfIrNfQN14zPSaia3KxheAP0byr9dK7pEOWYndxOtuwBC8YbyMBgM3RqEmtAntq8fPMnF X-Received: by 2002:ac2:4d10:0:b0:512:d830:358c with SMTP id r16-20020ac24d10000000b00512d830358cmr1189531lfi.49.1708563175939; Wed, 21 Feb 2024 16:52:55 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v30-20020a50955e000000b005641de6e853si4612058eda.82.2024.02.21.16.52.55; Wed, 21 Feb 2024 16:52:55 -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=Tokrd2vr; 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 5D80768D1BE; Thu, 22 Feb 2024 02:52:48 +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-vi1eur04olkn2094.outbound.protection.outlook.com [40.92.75.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 512D668CD96 for ; Thu, 22 Feb 2024 02:52:41 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jbkDgvItl8sH219hbhlM2c5j5Pqpcr4+mpGHXSxUy/745GYMf19Li51LjFQHOKbgDitPJLDKszbH2AxpnqX0ay8Ku8QLqkuldRylk95FB2A6ZHw3N50HtJ5I1unt13hF3Zj1PgkivqnLPqsu8kKfwdVx4a6IRTK+m0SkHRWO3M2pMEmp6YblfLEXSCWXZN7i9l7UkqbItBL/8LlNTwMAAbrAAU05RJOBfw+p6+6K23PtrMp5J0dbl1D0jFKPCNXXf3JgPYsX7CLZb4lf/SYEStp5eYMYkiK0YxsGJ5aF3Uz3izF4ybMp/lTEn6ZEafqTKybr4EEambFW4iho0FTYag== 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=9RB7UHoObthMHYAE2FeRs8NYB1Hk9jVcnB4WR0zyBag=; b=heRuzgwuRckAqilDQLWo91f2rgtjmfnLjjTwwhpt8kkt1z1mKoJgTQNtt3Val3VVBhSwejuL0Pt9GBuuFi9w+RqV9eB1Af3qc7OfhyfjfQySnVz3vilg+RrvVNCQISpAZGpgBt7VfuhlvfJs/dLDfXepW5ZlnSfYECKAQSK/1u5pXUW3P+08EmpXwPWeUaD+L2pOLntdrIUWzrO38DBTYaxCVIIWi0RR13JngQchvy/yks2gLKBPHIhx5R8jxvtBJvD/+gEnOWz8LM98a7JL5s6qiMdsz9QL51IcHHqpn9BlKZUSp6UK22r+AEJBGwdkOJE1W1caZmCxH62jsf1dRQ== 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=9RB7UHoObthMHYAE2FeRs8NYB1Hk9jVcnB4WR0zyBag=; b=Tokrd2vr6ZdBcDPWcZ5J0uAkNlpCAd49dlYqfyhFahUV2ZLots0OFRNntq8wf4jz8/Yq7emz22R+koY2fqC7nrXeThcIDb+1D9VMcgTNy8BTwB4DjkX6CHSySCaBbtmlhFEmsI3Sp/pxrBq8gZlWvnuKvzbW3VMm1W5kNfj+u8FOXhGh1zyBjQaubJFk1eoE4yRJhq042gS1rkLGc8n7FyF1pbp6zznrXHG9cuJlShkUYg6MolFFGAmBTvpG788NHRD14DErWHS+/qQKk64hmfwrAH4PhU3Iw3sh5JW3UKkUUwb7S9kKlZezLuLh9KJ5gzYD09TOGnuD2HnfsDv7Qw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0210.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:179::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.23; Thu, 22 Feb 2024 00:37:45 +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.7292.033; Thu, 22 Feb 2024 00:37:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Feb 2024 01:33:56 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [9GOEsSvHzuM9TP0ilede78QRSReiIZz9pSaJ6deyq9I=] X-ClientProxiedBy: ZR0P278CA0124.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240222003358.2051977-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0210:EE_ X-MS-Office365-Filtering-Correlation-Id: e8e4d3ed-e41e-4e73-6f2f-08dc333e7cc3 X-MS-Exchange-SLBlob-MailProps: quCBMN2EvO/QMfN5car8vw15rQ65X4V4Zkr+7LAn90jV9r1c/GvYkvO5qQcWL2lM0jamRpFA4oMNM1wiRkvRBnLf0n2pfwEN23ISjEoxQKg7ckSc52OTzfwBjjXcButG18J5NGI0Iz37RUGaWE3oHFwq38dfFaKLfuWV2ikVOi4CrdxxckVM+N5PJ4W+2dJhavKubVMZKIglSR+i54nBmu/eH5wbkKRZRU1BoibSVZFFTTkaFX9IqKGfTCxJg0YUPiQt4D+s0/sqX+zsp7hJf90M8K+6aSnUnlewwtrKgiYHV5ReRJXQd2M3qCpigXNiR8elJRG6WI9mRNRBorAWYm1a0B9kt4APgaczmSG6HH/5JKni2hNCA6DgtypG8yhZwqEhjHwNrNTwypMRz7gz4QuLmBlnAOKprgCXJSuS2eg6RGSOqc3BV+jpHuooEw4nRGv25mEGdPhr19yBkVpgCQ75Ls9YSAx7GsKgW31P0BzLdwhqODvb1qGriAberCjXQmaypVgMFPtKZJR1qyt81gf9QyODs+ewMhuiIJfhvK3eDEOStCFV6O6FvSsPMSZ54SKvZQrMYUdHS6MpnOwqvZHpcCs5Kd+5Ten8Zrm4E6SSbYIbDlUsS5FA3Hqg2L27hCyqNSLxTUJfwCLCrsXzjB17LRgrnL4JT5WW9xC+Zvy6JxlclOB6X4fBXCd76b4yBpESOM50v9cuVSUcw9IuqA== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BT7N5MdotfA+OmtPv+Mle+b8UcSpy/9Fqg/+CSPA0XDUbHUcHQ+Fowx/hPuZdKoy1ry9yFaxFp7BiIJA2C4ENUtw3eYo/i/z7CCGkZovQaQBfIqGR178Xsr2SbCMm89vCRnWrWiXJen8MgkKy2gp+/KZzG3Lt4l2T59PJlI4FADOYsNI4T9Ire8OhEnFty//G5A2OWbFq1SA6lMbgagHW3ejAZm+JK4ob9eEVlAoXn69ffFSyma4CmAsI7Ov20xMPR4ZStlVIaBDBdS3vM0MSVI0Nco610MpPFT0amYs8q4Hov6p0zLTVPwUuhG6PipoVNjvp5SJf8z3z6YnnOK/bYGS+89MB7T8BOypH0y1Qz9Q6vOjqfryNY8f9R1DWDQtwCfZf92xblkWLI/uWzNsfHYY0Aqz3CZa/eTpBZogmkaaSGNLGGxVN01DheFQjpHrMbS7BLQORq68DAF8EO7XzQndurSy/JG9ECsmwxymzuKFZsdIqRbQXSr9ESrv7mYQ7WB3M3VSymEs3xSmfZKqZz7T43R3JjRLiP9irRtTa+j7+QV0pv0GHsdaMbQwJ9HiKZNkT8VjkbrpUCsrXYR+TBD/ZUxi13tJyReqvFlx85T/8z9mYyew14qSRWGKKnqK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pOkZKzEU2Jz9yTTSHYuSvsasR7Vk1yRX7N/hsn0mFmUVWRWnEgTKGA20INmWR+TUGDlWYp+4YKlVl+WIhtqbxgyotcBwenmTiXb3DBA0vIQNn2GB3O5DotKnZQKSs7d3uEgKJunSqMLaP9L/Cq9kewgmQfSivpkWva5ZUexRhbqUnYTjNWqvK+Drs/EmDGv77+lHa6JvB2ajvBMVrF6KBXE2XbJ8uJTVF8v3w/WTVR/5UjNbDdI4/U/gkS5VjaDqRRxzNeFF9MfuwXg+09YGqCn/YV0m600i8InrONOI2HaEB7t06+b1zDdg2pis5518M02eLwA+JZs1y+HElju2LUS59h72QFLnXF+ygCij4t1SKOQ1uLddSM2B36B7m0YP0oQFKwcCx2xa+Hu70oLamHR9TCMnZzKLS1s4rWzVhM07OOdTkzHcHArsDLvmrBo9/VkDEPSAszBU4XvJ1wQTaSe5/blTf6gKtNDVClCH0JH8M3UU5axb1jAZ8egi1fY7vqDKxo/hT2uOPgdudeXwx5NkiZUju5OARIw9ifT+0VQggISMxat7VMxVteCOwcH5fuKYVgsNKanKthr+pDEeKYfQvPRdEDSctD9mL2byZD9Sf4GSCegfIvxqnNHVIrW8npJZbsIM57Z58Lx6KgcOE168caNcvPoc5MdKDani2K/2DLioEOost+0ro+0fDkLz1s5thuKs8Y0CgUff+klRnmIqvrfqjkclQfLoxThHVfT6CvMUWXCvGtDrrb3Nfyxu7xCTcs+T9oZnwuTsa4eGwgmRX6eSqLe/ctEhATo3Jj7pefOOfiuDrazfZGt5qt34Pp2fG8+1CizfqzbjQlOUqkLlall/QsC/NlVf9YetQP7AtmrxgM+W7Ay8yWR7yN/j1WFo48kiP8MhQcFkSoU3gOgbhScZJdGEfKUNmuHFSjzWcv16GDypaWkMjWfhRcJHhqjsNrs/PafdBmRGZPWfsrtcwSj9b6yQkHkIqSqc6CU7ukpOSeVjta60bK/gircwxS6zLYdjVjo4fkXmLQZck1vgLL1GA0fCv1GpIYoJmIfCcs5SxjEPLVAvE+JSrSvGkWZqhf0nuxGo2hqA0jEYozEtFqOB+GTmgXUwLdwqIFK7Hchf90URrU+Ei2GrENVzBCMATMBNHK3eSMAG8DADkIleejCedzgQ9ZehNkLmeIR+dC4zhVFbG4YUDQqucLXB0DHvQbgNrRZxQ6IWsxmIhOu0W4URkXE9mfL0LxjGT/IyjFQX1zJSYfsz5FMmv/z/vttbiKVtObvRXptM7kSokw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e8e4d3ed-e41e-4e73-6f2f-08dc333e7cc3 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2024 00:37:45.5628 (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: PR3P250MB0210 Subject: [FFmpeg-devel] [PATCH 2/4] fftools/ffprobe: Constify printing section header 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: APil4Xgb1OQt Allows to avoid casting const away. Signed-off-by: Andreas Rheinhardt --- fftools/ffprobe.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 95643f9a23..e63935baba 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -228,16 +228,18 @@ struct section { const char *element_name; ///< name of the contained element, if provided const char *unique_name; ///< unique section name, in case the name is ambiguous AVDictionary *entries_to_show; - const char *(* get_type)(void *data); ///< function returning a type if defined, must be defined when SECTION_FLAG_HAS_TYPE is defined + const char *(* get_type)(const void *data); ///< function returning a type if defined, must be defined when SECTION_FLAG_HAS_TYPE is defined int show_all_entries; }; -static const char *get_packet_side_data_type(void *data) { +static const char *get_packet_side_data_type(const void *data) +{ const AVPacketSideData *sd = (const AVPacketSideData *)data; return av_x_if_null(av_packet_side_data_name(sd->type), "unknown"); } -static const char *get_frame_side_data_type(void *data) { +static const char *get_frame_side_data_type(const void *data) +{ const AVFrameSideData *sd = (const AVFrameSideData *)data; return av_x_if_null(av_frame_side_data_name(sd->type), "unknown"); } @@ -474,7 +476,7 @@ typedef struct Writer { int (*init) (WriterContext *wctx); void (*uninit)(WriterContext *wctx); - void (*print_section_header)(WriterContext *wctx, void *data); + void (*print_section_header)(WriterContext *wctx, const void *data); void (*print_section_footer)(WriterContext *wctx); void (*print_integer) (WriterContext *wctx, const char *, long long int); void (*print_rational) (WriterContext *wctx, AVRational *q, char *sep); @@ -728,7 +730,7 @@ fail: } static inline void writer_print_section_header(WriterContext *wctx, - void *data, + const void *data, int section_id) { int parent_section_id; @@ -1056,7 +1058,7 @@ static inline char *upcase_string(char *dst, size_t dst_size, const char *src) return dst; } -static void default_print_section_header(WriterContext *wctx, void *data) +static void default_print_section_header(WriterContext *wctx, const void *data) { DefaultContext *def = wctx->priv; char buf[32]; @@ -1226,7 +1228,7 @@ static av_cold int compact_init(WriterContext *wctx) return 0; } -static void compact_print_section_header(WriterContext *wctx, void *data) +static void compact_print_section_header(WriterContext *wctx, const void *data) { CompactContext *compact = wctx->priv; const struct section *section = wctx->section[wctx->level]; @@ -1423,7 +1425,7 @@ static const char *flat_escape_value_str(AVBPrint *dst, const char *src) return dst->str; } -static void flat_print_section_header(WriterContext *wctx, void *data) +static void flat_print_section_header(WriterContext *wctx, const void *data) { FlatContext *flat = wctx->priv; AVBPrint *buf = &wctx->section_pbuf[wctx->level]; @@ -1523,7 +1525,7 @@ static char *ini_escape_str(AVBPrint *dst, const char *src) return dst->str; } -static void ini_print_section_header(WriterContext *wctx, void *data) +static void ini_print_section_header(WriterContext *wctx, const void *data) { INIContext *ini = wctx->priv; AVBPrint *buf = &wctx->section_pbuf[wctx->level]; @@ -1634,7 +1636,7 @@ static const char *json_escape_str(AVBPrint *dst, const char *src, void *log_ctx #define JSON_INDENT() writer_printf(wctx, "%*c", json->indent_level * 4, ' ') -static void json_print_section_header(WriterContext *wctx, void *data) +static void json_print_section_header(WriterContext *wctx, const void *data) { JSONContext *json = wctx->priv; AVBPrint buf; @@ -1795,7 +1797,7 @@ static av_cold int xml_init(WriterContext *wctx) #define XML_INDENT() writer_printf(wctx, "%*c", xml->indent_level * 4, ' ') -static void xml_print_section_header(WriterContext *wctx, void *data) +static void xml_print_section_header(WriterContext *wctx, const void *data) { XMLContext *xml = wctx->priv; const struct section *section = wctx->section[wctx->level]; @@ -2334,7 +2336,7 @@ static void print_pkt_side_data(WriterContext *w, { const char *name = av_packet_side_data_name(sd->type); - writer_print_section_header(w, (void *)sd, id_data); + writer_print_section_header(w, sd, id_data); print_str("side_data_type", name ? name : "unknown"); if (sd->type == AV_PKT_DATA_DISPLAYMATRIX && sd->size >= 9*4) { double rotation = av_display_rotation_get((int32_t *)sd->data); @@ -2635,7 +2637,7 @@ static void print_frame_side_data(WriterContext *w, const AVFrameSideData *sd = frame->side_data[i]; const char *name; - writer_print_section_header(w, (void *)sd, SECTION_ID_FRAME_SIDE_DATA); + writer_print_section_header(w, sd, SECTION_ID_FRAME_SIDE_DATA); name = av_frame_side_data_name(sd->type); print_str("side_data_type", name ? name : "unknown"); if (sd->type == AV_FRAME_DATA_DISPLAYMATRIX && sd->size >= 9*4) { From patchwork Thu Feb 22 00:33:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46425 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:26a3:b0:19e:cdac:8cce with SMTP id h35csp48145pze; Wed, 21 Feb 2024 16:52:47 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXY1i8KlplTe+bCyiU12j8PQtmiBdpnfTho5cAJ/8886og7ae8Z3YFDJoYweTEJDEzPZSbWladpMntNJI+h6epmJ6a9Ig6awZb1/w== X-Google-Smtp-Source: AGHT+IECJZqnYYIPzHggX7+V3j9sV2467hi3U+p0HDBvfdCF5de2oh6IQ5s000SOOIuUAfiNXDPM X-Received: by 2002:a17:906:5a98:b0:a3f:4ef6:2842 with SMTP id l24-20020a1709065a9800b00a3f4ef62842mr1896475ejq.17.1708563166859; Wed, 21 Feb 2024 16:52:46 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b6-20020a17090636c600b00a3dd255ac9fsi5005331ejc.952.2024.02.21.16.52.46; Wed, 21 Feb 2024 16:52:46 -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=Imr2VijP; 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 20A7568D1A8; Thu, 22 Feb 2024 02:52:43 +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-vi1eur04olkn2094.outbound.protection.outlook.com [40.92.75.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2728C68D0CF for ; Thu, 22 Feb 2024 02:52:36 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CAETcqkP++zS75GL+RXdbWeOBxAPGU1nlJlu97jj/YdmgcE6g0XQwEsP26pnMhBH0aGn020KzmRoYSL50hakcRrvMjAMCnv4jNme+HMMq3si/lpzBrHAfEqnFaT5nuGFT7Wb7HVznayxzhBFdYV/2g2gEszQpblwdVG7EHqEg+Ufe16IdkJVtGEEJacEtYy/zl+f04+YheS5Mvp/oXTkj8B9/Z+i96T06vH1RbbW+JFKJlj4WDlXDAJ/vL1F+0zJ/xkXZ0lyYZ360+M5Svryo52Rp+1voMbSheLFJGwvCufjR7Fd6zt6RadLZyOfVRP7uRsKYCnQWa7CbCB9utWt4Q== 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=8oY/VquIMoJnvUC0DwL9+NYCXipphMaqG+IBdubXrCI=; b=CKB8ax1zOsuCoJM00AszAuRKuoPtj4kxrJpfNdcLzdhs2zLk0KDBDHY89kQ0gyZ12/eA9tkDhpOgQcvpNtBENaYkdCxbC4P2Mh+eH/PNTuIM2FSjm4SYOu5iyspkJJTc/EMHfK3HBBfkC/FafYjPk6pN6zsj6KW2PxxDASykXQdiSGCjKmMYUy4ceNyEdliYY7By0wdreMkdS+wjV/RBTC1uXLqj33Izh/fWjWAaYVV7RT1fy4G0hTVP0ZbvvPp4YbUDd+GbPZPc6+I2zgYikrB5rnm+h2fp1fkIoVPXLwvwb2RB4Rf7a5q3Ksy6wEZPzjfev/Sm+81bHzxsDBcw1g== 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=8oY/VquIMoJnvUC0DwL9+NYCXipphMaqG+IBdubXrCI=; b=Imr2VijP4Nku/r687oM0zoW3Q6bTqfwK8v0BlxxKWZPsvDSiBxj0cqokQ0vmlwC6ksrnhBAP3djJWmJ5cHa6NMpbsLG8nfPTn3WwG7+8ullQLhkb1A2Umodosw2P70NvOuROuL1mj1r/FKXMNBCMLL0KqCwb+CUFxtF2mvowbtszdABAlzk7+DOE2yCfUyT9si5UHCNE+XTBE4qrreL51DoFf5Jk8NnhrLPXCoFxLfWpnXOiCVV7qkyIyj68K5TSdgWmCVluJ5cFQdqnQaTf/fTLrYJlCCyUu2PaBqjPlLR/I62lQcYwe7peZ6TmzA1ZUDfdMDyq5g/9BLrmGfUoIA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0210.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:179::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.23; Thu, 22 Feb 2024 00:37:48 +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.7292.033; Thu, 22 Feb 2024 00:37:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Feb 2024 01:33:57 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [AxuCfHKNmtmuxJbszmYp7/+vWWlrLOUZmPf7Pj/AAg4=] X-ClientProxiedBy: ZR0P278CA0124.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240222003358.2051977-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0210:EE_ X-MS-Office365-Filtering-Correlation-Id: 074db865-22e3-4ff7-82b3-08dc333e7e5f X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicB8p+LE2WtExJI0VwW4xhCzCI8xhQIyGyeVKWKU+O8JvIs380DWM1BU2I7lI1lYYU0nk86elbjo7aglyXJwuyLf+XkV9233uALu0/gOas6xwhpkfo5Z24VK081GPuB2W50XfygLgqW5DJkUj2U4FlkIDHhZCXEvryaW7rgguCI4EOp/+nw7mn0MabeiRHycbeCvKS5Xe3DBCfOMqdNoqG7YNSUxDdn1ZXRnnp6Vo/bR3PyDW7GtgGDjk4Itq985arrJWHI2p81RnT5BGj40OEd9D3MnSYognrycLNLBb2WfLEGyojZFLfjjzJkatPVRWVkHfH12EgQPtwZLgP73jUMlxtiB5yxOnZxrlkpQV4tY+EJtFRQwUzZMajUHr6AD+/jN5a6EUoqmZDBnlMZCUfQyon+EITtKuQOb+aNxckaBoESSOfAPhdcvIMnj+mPrYa00K6RQfnmSI3LoEViEttWMr/iKfUb9zYOQRWUDgVszpkK5CKxBAUs+b4H44igDdFk/hFnF3HEA/CNE8vgA5lR9GdKI/iR/JD0bXQLNSHGOU0Xce2xcJk36gWMhJol4RpKS5jv2DMkaLM/H5uh+VxSJ2gfhKRBzOtACvI27WJ/Y6gkuL9bHqq68S2kkVYQHOyOvV/vM5S2pT5g4nl8w4wVbwUOeKHHDaEu1sCDXC2QaC6Ezeg9s8RsDl/34ySlGfjhSQwaK4jdLra0PSW+ZLXbpbchr8Wrgpdds5TpdxEm9Xg== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hU1JU+64LO/AkjsHyCP2oBHapKR5OvP9RAOhWPskyOaWNsI5IKwAGnyQXvUSvkvQKEtcK9a0oCFVtbFCLkYY/e8PIRQl6k5BrRRNb6JkWKnPpOBfbOuoShOwc9Sg6fW+dojuhRDpp+4zRE9Yc4sffUkORy9rcQ7jK28kae6XtPfk4VcQMZuNw6yWblyZZY7zwwjWMY3HHtdRF/C8HhYNmv2zJECg9aqII3zIT4+FtU5W9dJa91GFseLJH4dqbOhV7S0mbtrhiuXpVLoUuMjbUkB2LeXF3nuC1BrQSP3q5wnjjyC05dPdWPJMQWEp6n+/V0YKV6A88JonagPk42RztFZiSS4m2rCSVLeIBqNhOzqrhbqlbcy2VORTHI3rqQpFg2so4zYT2mUyBtCykwKop6HI98lHWvg25C+s/eu9FFNwvhkoKf/KzF0xiJBtMLmR0UankATeb1kVNqR5RjH5MyfZCzSHFj1SuTLSnkzkJr08iITWV3sDIVAoHBrHnZlVTThvEuZfWg2PkByfsBfAOupleVpR+o/iA95gd7qxm0NnTDWurAIDcuolUIluM50VcCmm/rqCdgPwVnJnDSYbWqrTHrIbuOhpoSOT7duEtQ4= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AhCbQGOd/klr1D/AcbMF2IzilBmSpQyxHePWxkJ8bjBCYT1qoXPrCWFa/7PTPbedxjLeBeATusdzwghciiuC7DGIb0HcZPJGlVBL5G0k4RBWrrDzZv0R5DPjY4fqnssthbnCRcu+pEw0fSY/347NplZgExrYeyndfLtmqyAdgu7xYfdeH1ZKZjCNsSI/m6abtEmkHroR6y9kErRyrab1dGgHtyF9txw+Ho0H2OgH45m3RoiUOM5Rxrz5b7Oc4g3EnvULUmwShmi+wLeA3Yv9v+iZxmQPOtEvnJXEH/6wb0vz4TWDxFmJz+DMOcFBI7YwZpg6wyUll03eqZX14cXEqk1qiSmXRc24DhjZCk8tEL/UIQXqyPZLNXGpXvP6G2OLVzNdGbczNMjDYhufZsynkcKwVX8CGBDo+tBgbygxrTHdtaF3dkyAiC1USKF+rcHFwYPWIvBVSZwsiYtD1Z8y4IVoDgP7cqqf05Yuippb9cX64v2SbWq1CskGv1844/xdbiKzOkQq6fdnK2LF+MbWBdrV6UdZ1dllYsr+yR0smlmwuyE24D18EZh1Cb2u0zBxCVz06Z3hVLHXDguOeYXxhcjlz6Fh7H+6Z7sV34oq+zIsCe8j7HprvZbRxgQnbf1kjzZORIhjq3FXKqDrH2Vya3Xgt1qRopxmi9fl/LLu7HEj+SQsY4vwUQZMU7rNYex+EdnaCiaUYjNrVzDMXeAjJHh1iYN3ik8AjOUZ9MEH+EVxCfCUUfFv01DL+RWq1+Hyg57+cO93KA5KSkMYRGScbz/3ppZURBYt0lqutcTXzVDLcL1V3JYfkrMyqKhBhG0qnffH6wyhW3j2qS4s9RqQsLOX21ssp7yvnYkxGbqedBXKoLKhw5koUn2pDsx2cGyCoUdq2kU90vcPRHlehvdf8oHAPRWAc0fSoRFS0HrWGubpdT7psC2LBAvF6lLlSNZppLYQf2gcT5bJ2p/V+HU7atRvt/UehQ1MSzDFoVtyX1g9H1HRH9R7zzzGWPIOBeBFLtXa3kNuwqwNRU4n3yZ6q9oRVnwwyDHOyFTRHsTbuVcW9dzNnx/VDHOUSr0FehheabM1VtCbeHbkIvu/4EKeD/+Zm3gFqpDtY2FDmCs2UcE5xfMuKOv3hF1TVpb7M5NVbxwOfKXF6pS1QAGik9PiLlL1y6AYLdLv2aWSzdlSYgfNEdqYpHkHsh0jZdIktztsI4wjov3byM8ww3scG1cDHQFvUgGwsJrHdV02lZpeCw56sCtr1r4iT/+V0iQxlZJ1ZaNywmX6dPidHKZ1W5CbWQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 074db865-22e3-4ff7-82b3-08dc333e7e5f X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2024 00:37:48.2393 (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: PR3P250MB0210 Subject: [FFmpeg-devel] [PATCH 3/4] fftools/ffprobe: Simplify printing xml values 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: Txk4pzNMbbZp Signed-off-by: Andreas Rheinhardt --- fftools/ffprobe.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index e63935baba..31081d19e2 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -1860,7 +1860,8 @@ static void xml_print_section_footer(WriterContext *wctx) } } -static void xml_print_value(WriterContext *wctx, const char *key, const void *value, const int is_int) +static void xml_print_value(WriterContext *wctx, const char *key, + const char *str, long long int num, const int is_int) { AVBPrint buf; XMLContext *xml = wctx->priv; @@ -1878,9 +1879,9 @@ static void xml_print_value(WriterContext *wctx, const char *key, const void *va av_bprint_clear(&buf); if (is_int) { - writer_printf(wctx, " value=\"%lld\"/>\n", *(long long int *)value); + writer_printf(wctx, " value=\"%lld\"/>\n", num); } else { - av_bprint_escape(&buf, (const char *)value, NULL, + av_bprint_escape(&buf, str, NULL, AV_ESCAPE_MODE_XML, AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES); writer_printf(wctx, " value=\"%s\"/>\n", buf.str); } @@ -1890,9 +1891,9 @@ static void xml_print_value(WriterContext *wctx, const char *key, const void *va writer_w8(wctx, ' '); if (is_int) { - writer_printf(wctx, "%s=\"%lld\"", key, *(long long int *)value); + writer_printf(wctx, "%s=\"%lld\"", key, num); } else { - av_bprint_escape(&buf, (const char *)value, NULL, + av_bprint_escape(&buf, str, NULL, AV_ESCAPE_MODE_XML, AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES); writer_printf(wctx, "%s=\"%s\"", key, buf.str); } @@ -1902,11 +1903,11 @@ static void xml_print_value(WriterContext *wctx, const char *key, const void *va } static inline void xml_print_str(WriterContext *wctx, const char *key, const char *value) { - xml_print_value(wctx, key, (const void *)value, 0); + xml_print_value(wctx, key, value, 0, 0); } static inline void xml_print_int(WriterContext *wctx, const char *key, long long int value) { - xml_print_value(wctx, key, (const void *)&value, 1); + xml_print_value(wctx, key, NULL, value, 1); } static Writer xml_writer = { From patchwork Thu Feb 22 00:33:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46424 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:26a3:b0:19e:cdac:8cce with SMTP id h35csp43363pze; Wed, 21 Feb 2024 16:38:27 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUlDY72HGhz07P2dNPsuaM+uVan65BBNN++bBKgi0ZadPp9a/yo5Y415oVZaNz63y1kkhE4OUg/LTaULzu0zJw3ITG7BBY4hU6JLg== X-Google-Smtp-Source: AGHT+IEd+oJhtn435ch6JhHDkv7JAEZ5oyFedjD4tTnIZq/slyXD7+n08E29DXiC/IOBI0s0OvmV X-Received: by 2002:a17:906:355b:b0:a3f:1139:13bc with SMTP id s27-20020a170906355b00b00a3f113913bcmr4309474eja.74.1708562307389; Wed, 21 Feb 2024 16:38:27 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hp18-20020a1709073e1200b00a3e5c23f0e2si4058698ejc.935.2024.02.21.16.38.13; Wed, 21 Feb 2024 16:38:27 -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=S81gG1Gh; 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 C775268D1AD; Thu, 22 Feb 2024 02:38:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2090.outbound.protection.outlook.com [40.92.74.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 484DB68CC25 for ; Thu, 22 Feb 2024 02:38:04 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g9V7qg/2E1Tx+m6cS6xPKWQRi1F1aop4bRznaA2JX6mqz5ZSSub/l0SOl3kRU7AYnnfqMOFo6p+yH2seRn1wcOjSgMd2+MhyW827ZUSTz8PBR5zQRmsL5cbeOs7AaGs6x7YBXDdIoEavnhN9FJaZHoL12SUw/JiTqR5tCkpNu/3q7WOcNBXDBqy4SvRNtbJRXkHDtburEgZUIy6s/tVR4QXIKt7PI5Or7q3CjRIpswMajLxj4nANCw1aoHxbUmJigbF1KfAYXUzybcsg/ScKGHukjDGuTwCDNX3zHDVG/Rk8qEDR5HnfG1CalJ8BH3en4VbQT2X/a7cdgJvPNmRkSA== 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=Ebar2bva/avY/8nKmePJxN6nMmI/bk2nDtdPMzfTjZs=; b=br8Hw3yNkXhflFkBFqp28IqWP01jFbZAQRyM3RlPf77lJACQpHBi7aL1zpHNITdb2j6r8gCUknvybqu+06kA8jfwVIizdBrPJR0hMzxEH2ijFVLV5n4SvnrPb1mEeeMuBMKxH5EkyuGWvDSUUXoa6U4W871ijMgvJrHAvH+IotZ3W4vmPqoNXR1O8nBl40cg8sYTbNhUMvCHN0nFrjty+C2r3MYcawVE8ayI7nDvBFC9CKn75dVYQtnYJHD1AM/e8c3H/TC0glfV2pejSd+gBpwzYXhK5Vl+xba4xDj92yGp3h9w3ZOQL2Kk29L0LxUbS7VVdMCROjKf2G5ETLN8mA== 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=Ebar2bva/avY/8nKmePJxN6nMmI/bk2nDtdPMzfTjZs=; b=S81gG1GhMPCijtn2gREpAz7dgAQ4mD3z1OKSwSq9JMQZXiV0QQXXx31KnM4O6r1XpD0E8QBtkQsitialRgssyaY6eK/cQ6Yxfh+ePXvS8abwpx99jRhbz8QHmahyMjG7vxIgC6VGRD6T63wOWdp4SwM/DcEtZGaN0o1SPq+/e/Mgujiz8m3Rl8D/+cic4giHY1OLdXL16oWtDODmC5JEywj0adzwyeBd66ZsN0a5DWkB4YFDBkrMZkO61eLl5pBsz1UiEsF3ZX3il2qK2Na7M+DWZ9pUt34+Z/GDCnSCcfJqbS7DA0ZnA1j+f0aEVoI1XMQDUPMYkVRfmkNKfYrcIA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0210.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:179::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.23; Thu, 22 Feb 2024 00:38:02 +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.7292.033; Thu, 22 Feb 2024 00:38:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Feb 2024 01:33:58 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [TRe7Jxhhr0QP1EiHzKPuLjPvsNjtjAIknedZcJFAGY4=] X-ClientProxiedBy: ZR0P278CA0124.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240222003358.2051977-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0210:EE_ X-MS-Office365-Filtering-Correlation-Id: 0e5178e5-580b-4ef6-ea4b-08dc333e86c6 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnoD9KdWYVDMKjjxPyiu4b2HkvEF3eBSmMMCloB6EQNzMth4EAoy6jWBu5AEV04zFhTK/c3jjRURlhJPdte+4gCaHegJGW3mONpxy05XPeOUjZ519zsF5j9tQVBDk4ur9bj/bPhvdu7QyX2cTNfe37ti+0Vg2bkULxRiixHT/S/1Bltoeb4tpUYhCJUoHux8eASJ+zWyIw8lDUIBxedUXdOgkQBp3BVdmBXtkcWitc6LeFQOXgWXxfNPWojaOOWt4/+yINvkxsqOc919xVtiygEzGvZTiuzT2JDED4xpyu2o4uIrdGj5PXyXCJHaWYk5zPQBWasDRaUCRF+ivYNNaAbTJM2ems8wOc+LSGWJmQfZrziriI5MoHeqgFKMwpgh/EVYZpaa7S0QOAQHbot/bS6EdT0KdN68XAhiGSlUJX11ICCSqSjKltle5HZdD3YWd4xL8C9cxm1X2UPSm9Uz5PdsTSr2XUPwJlHQg5p4H+gJ8ROCwErxIvN6BTrcFfEUMItZamT/GVLLd4sluAbecAI0t7UW8BcA5iUMtieuffk51/EJMWU1sjiizvAKV+l1QDFgkk2nOV5r7D5YuzysAM0b21uUmAF1ZWfizQ3asotYQ5TY+AqqmDVjQO263bT2e43xxdiHsZs2pLOhPYSax93p1c4yitUx2WOjmpGUDkNPFUbnoE1GCF9XDvoiuSfX9mKYBTUoLVpfYQpK5vtueQitkRz80z9iX4rsLj5f3qB2GiJiK+oopYYkdpIsJ31uDTg= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wf37RJA7kW6gCFD4iHrGpQ1dkbXi0PV8URM8t7lmz8GtLpLXv7a5wG+SsNK28GtnQQARvkT7VuREme+wJm2fyeFbTyi8cvKAh+A72zRhDp/cvwEuF179bRQY38+UW4Oz5kE47WjceiTEB6gB+pekGZVxvYhmP+s3eW4qqUHuCBDIRniZVu3pPNPGW8+DBiVfSgDIhonmtlRUfX1yOWmhZZmVpzC/K+pFvAk0RIvOX4+RPipUV2axumRtcIrklm++YuYrzhdPFmRyw55SrZgVTPVueRVXVrkIrLOUH4cbxMJmXdLy7sQ1459L/F0LcJ2OpdHiCtAjMGbyz0zEXtvyUiChModG7QOA/ZdoSa21HNyLL8sfuUi4VJgqMSJ2f/cKLfhUbS/P0Ww90meRE/PgoylaTFir1ppSq+vNsbQtn8ZaVkxN2IFPVIVBx/VoJ6hj0+g6gL0BKz+R9Un17sQcY+R00k89ddGVjOW619iFxGU6nk97Qlkr11W2sxZA4F9CynqD15yXz0cmD8LceA0fbvehx2Hdp9REMo3BCN6hNmI1i2fHmcrzY0F7QlTM/0w3tltBJJNXSeqJoI70Si3iAZgpo/K0+6PYE2RwRdHFbxnKc2A3c8yRk4/MuRomcQpl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4ux8wsqbOrb4Sm9tU1QOjOl1gdocXrYRj95tGUvML5iOf5t7qirlLjga/1BbG/URwkzFFfyaZN5a3esJcBH9/hEPizRoU6cqj48EV9eVn6BO4/c4dQugGp6d7aBQ6MuRXNTKu3bL4UH4lqgotAVEjbUbjgwz+hqWFWGf8RhTei6UGruCAc+eWGFLp1WBnzndmbMGbOZ39oxPA3B7YrKqkPl0TGqSI2z8eihFa41eA6j4u65u3eaqu9wlJyZy6gar3OnzRgvEDekEUfHXogk5l4fd2312G+WOOinlTXXMkauynQSJO/PNl+ONUzScx/wplcJ0WPZVqCFxVgeupoZZ7y1e1R6ypd1LbF7BoOLDZXGXysuSdlYDb9RNCTxKoiaZnwGyQwnq0/vWmZt9IgxKzhfZIsCsej186NqG6y45kpnxEbie/Ps7nltjUeDTup9TtOhgySNLlwFi4PXnciV/x8CDmZd/4mwp4ZSCOxhzUFEuZiFaSO7pRAYHOVlxDns+uKUWiIz92h+bwtsbPqulxwjrol6+cwMQ1yk/Vq87W9iho9+x3ryu93wOUgZcpxRxYkgSsgHe+PezQ8Ko6/a5CCPGraUWD53/YSzmuWEnaokT70te8AQdtPm7FIVlcIRMJ4J3PxzsXdIQ2vdjfH2bONDIBZaoZ+0gq+IREA0vpwCixTpierqlevPJ3tfsQUpp31OhqOE5+pPsjM5T1EUwHcaeVc59i621/uRoythZO1skQPmi/N/GdRLDyaibDJr+FqJj/ezafdtGnB7GPyIm9asFk+2NkQyvW3r82GOpjkp3j01Od+2ii9kvkK83D7xL81LI05llqrD697eNXSYNrnHQu3U/1NBbhrlQZUz80AOiGgMMPJmd2lPp/1t6eP928b5UH9PfQLDhYEfk2HdkxRTlQL7ZpGfy4ft50g+Zd2xgBzYfixZbXyu5DT1PVmF9TV5Q2d9sGFyBfyLn2fgpXwr3QJzkUjbrXsUPidoppVxBQYovW3n494QODehNQilOy0mIIduhmYICdzVAdZ9KVAsRu3tgZh9AUkyPgUu7yvNbCqlCul0FajUCUl6QXr5dsUCFOQukTqNt29kxX0KZrKQOwuOkladgvHUzTbM+AuE879AmsLTMiZrJxBgF7UkTlEXAYVIHqScNwV3MydR7InzolCCW4xqTnVgqv7c875Y85Ylgf/PgGsApd7ogYoOLSaaWLFCLQHVJaXU4WVMVZKrXLSrC3cR7BZZiAJN9jeiYp2Z9kjMlZ/sXk1MYBDv/tCpnybEDK7/ZEw+avqlaXQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e5178e5-580b-4ef6-ea4b-08dc333e86c6 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2024 00:38:02.3440 (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: PR3P250MB0210 Subject: [FFmpeg-devel] [PATCH 4/4] fftools/ffprobe: Use int64_t instead of long long int 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: o3um/Ri/7mve This makes ffprobe match the rest of the codebase. Signed-off-by: Andreas Rheinhardt --- fftools/ffprobe.c | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 31081d19e2..ea225f14ab 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -397,14 +397,14 @@ static void log_callback(void *ptr, int level, const char *fmt, va_list vl) } struct unit_value { - union { double d; long long int i; } val; + union { double d; int64_t i; } val; const char *unit; }; static char *value_string(char *buf, int buf_size, struct unit_value uv) { double vald; - long long int vali; + int64_t vali; int show_float = 0; if (uv.unit == unit_second_str) { @@ -427,15 +427,15 @@ static char *value_string(char *buf, int buf_size, struct unit_value uv) const char *prefix_string = ""; if (use_value_prefix && vald > 1) { - long long int index; + int64_t index; if (uv.unit == unit_byte_str && use_byte_value_binary_prefix) { - index = (long long int) (log2(vald)) / 10; + index = (int64_t) (log2(vald)) / 10; index = av_clip(index, 0, FF_ARRAY_ELEMS(si_prefixes) - 1); vald /= si_prefixes[index].bin_val; prefix_string = si_prefixes[index].bin_str; } else { - index = (long long int) (log10(vald)) / 3; + index = (int64_t) (log10(vald)) / 3; index = av_clip(index, 0, FF_ARRAY_ELEMS(si_prefixes) - 1); vald /= si_prefixes[index].dec_val; prefix_string = si_prefixes[index].dec_str; @@ -443,10 +443,10 @@ static char *value_string(char *buf, int buf_size, struct unit_value uv) vali = vald; } - if (show_float || (use_value_prefix && vald != (long long int)vald)) + if (show_float || (use_value_prefix && vald != (int64_t)vald)) snprintf(buf, buf_size, "%f", vald); else - snprintf(buf, buf_size, "%lld", vali); + snprintf(buf, buf_size, "%"PRId64, vali); av_strlcatf(buf, buf_size, "%s%s%s", *prefix_string || show_value_unit ? " " : "", prefix_string, show_value_unit ? uv.unit : ""); } @@ -478,7 +478,7 @@ typedef struct Writer { void (*print_section_header)(WriterContext *wctx, const void *data); void (*print_section_footer)(WriterContext *wctx); - void (*print_integer) (WriterContext *wctx, const char *, long long int); + void (*print_integer) (WriterContext *wctx, const char *, int64_t); void (*print_rational) (WriterContext *wctx, AVRational *q, char *sep); void (*print_string) (WriterContext *wctx, const char *, const char *); int flags; ///< a combination or WRITER_FLAG_* @@ -772,7 +772,7 @@ static inline void writer_print_section_footer(WriterContext *wctx) } static inline void writer_print_integer(WriterContext *wctx, - const char *key, long long int val) + const char *key, int64_t val) { const struct section *section = wctx->section[wctx->level]; @@ -1105,13 +1105,13 @@ static void default_print_str(WriterContext *wctx, const char *key, const char * writer_printf(wctx, "%s\n", value); } -static void default_print_int(WriterContext *wctx, const char *key, long long int value) +static void default_print_int(WriterContext *wctx, const char *key, int64_t value) { DefaultContext *def = wctx->priv; if (!def->nokey) writer_printf(wctx, "%s%s=", wctx->section_pbuf[wctx->level].str, key); - writer_printf(wctx, "%lld\n", value); + writer_printf(wctx, "%"PRId64"\n", value); } static const Writer default_writer = { @@ -1303,14 +1303,14 @@ static void compact_print_str(WriterContext *wctx, const char *key, const char * av_bprint_finalize(&buf, NULL); } -static void compact_print_int(WriterContext *wctx, const char *key, long long int value) +static void compact_print_int(WriterContext *wctx, const char *key, int64_t value) { CompactContext *compact = wctx->priv; if (wctx->nb_item[wctx->level]) writer_w8(wctx, compact->item_sep); if (!compact->nokey) writer_printf(wctx, "%s%s=", wctx->section_pbuf[wctx->level].str, key); - writer_printf(wctx, "%lld", value); + writer_printf(wctx, "%"PRId64, value); } static const Writer compact_writer = { @@ -1451,9 +1451,9 @@ static void flat_print_section_header(WriterContext *wctx, const void *data) } } -static void flat_print_int(WriterContext *wctx, const char *key, long long int value) +static void flat_print_int(WriterContext *wctx, const char *key, int64_t value) { - writer_printf(wctx, "%s%s=%lld\n", wctx->section_pbuf[wctx->level].str, key, value); + writer_printf(wctx, "%s%s=%"PRId64"\n", wctx->section_pbuf[wctx->level].str, key, value); } static void flat_print_str(WriterContext *wctx, const char *key, const char *value) @@ -1569,9 +1569,9 @@ static void ini_print_str(WriterContext *wctx, const char *key, const char *valu av_bprint_finalize(&buf, NULL); } -static void ini_print_int(WriterContext *wctx, const char *key, long long int value) +static void ini_print_int(WriterContext *wctx, const char *key, int64_t value) { - writer_printf(wctx, "%s=%lld\n", key, value); + writer_printf(wctx, "%s=%"PRId64"\n", key, value); } static const Writer ini_writer = { @@ -1722,7 +1722,7 @@ static void json_print_str(WriterContext *wctx, const char *key, const char *val json_print_item_str(wctx, key, value); } -static void json_print_int(WriterContext *wctx, const char *key, long long int value) +static void json_print_int(WriterContext *wctx, const char *key, int64_t value) { JSONContext *json = wctx->priv; const struct section *parent_section = wctx->level ? @@ -1735,7 +1735,7 @@ static void json_print_int(WriterContext *wctx, const char *key, long long int v JSON_INDENT(); av_bprint_init(&buf, 1, AV_BPRINT_SIZE_UNLIMITED); - writer_printf(wctx, "\"%s\": %lld", json_escape_str(&buf, key, wctx), value); + writer_printf(wctx, "\"%s\": %"PRId64, json_escape_str(&buf, key, wctx), value); av_bprint_finalize(&buf, NULL); } @@ -1861,7 +1861,7 @@ static void xml_print_section_footer(WriterContext *wctx) } static void xml_print_value(WriterContext *wctx, const char *key, - const char *str, long long int num, const int is_int) + const char *str, int64_t num, const int is_int) { AVBPrint buf; XMLContext *xml = wctx->priv; @@ -1879,7 +1879,7 @@ static void xml_print_value(WriterContext *wctx, const char *key, av_bprint_clear(&buf); if (is_int) { - writer_printf(wctx, " value=\"%lld\"/>\n", num); + writer_printf(wctx, " value=\"%"PRId64"\"/>\n", num); } else { av_bprint_escape(&buf, str, NULL, AV_ESCAPE_MODE_XML, AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES); @@ -1891,7 +1891,7 @@ static void xml_print_value(WriterContext *wctx, const char *key, writer_w8(wctx, ' '); if (is_int) { - writer_printf(wctx, "%s=\"%lld\"", key, num); + writer_printf(wctx, "%s=\"%"PRId64"\"", key, num); } else { av_bprint_escape(&buf, str, NULL, AV_ESCAPE_MODE_XML, AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES); @@ -1906,7 +1906,8 @@ static inline void xml_print_str(WriterContext *wctx, const char *key, const cha xml_print_value(wctx, key, value, 0, 0); } -static inline void xml_print_int(WriterContext *wctx, const char *key, long long int value) { +static void xml_print_int(WriterContext *wctx, const char *key, int64_t value) +{ xml_print_value(wctx, key, NULL, value, 1); }