From patchwork Thu Jul 6 21:06:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 42472 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1e:b0:12b:9ae3:586d with SMTP id c30csp6810167pzh; Thu, 6 Jul 2023 14:05:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlGI76RhrDhdh2oZJlAF4gx6nBDG7cfPCt3jayzAUegJCZQXZihk9bF0c8DeoNJZh+hcU1dZ X-Received: by 2002:adf:fe43:0:b0:314:2ea7:af4a with SMTP id m3-20020adffe43000000b003142ea7af4amr2383889wrs.13.1688677518312; Thu, 06 Jul 2023 14:05:18 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r7-20020a170906c28700b00992e3285fc3si502601ejz.545.2023.07.06.14.05.17; Thu, 06 Jul 2023 14:05:18 -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=@outlook.com header.s=selector1 header.b=eqnwDadq; 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 3DFF268C75D; Fri, 7 Jul 2023 00:05:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2085.outbound.protection.outlook.com [40.92.91.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 01C3C68C639 for ; Fri, 7 Jul 2023 00:05:06 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aIqCJD6IE/uA5bqAUBIV0pENPh4H5b0epyHAJelq3TYEAUlqWGoqaQIO31QznPYCXpN3jH4WoMEFeHYBqUv83daOUA9x9RDeOtJySYl757bJoBtFJQlqNK6yMrmQqaT4wcVlsilaNgWV5ZzBIYf67B8BLLcWzKx4ewGQBR8wIy1YI8OtZnXAkBXYVScPDU45ZwfwMOvLXhlrgQrrbFyKxhVTankxDo6Lct2mtup12oMtI8KP25dFL61E3mefL6s0yK7nZlDuK2/z30/ZRx7UjpYYGAgsPHpo3sK+STzif0IOx8J8c+IChePBlDMU00M8WRTKsL+WnaaZ9u00HJyHNg== 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=acla8zgY6i0evjN604hD4zo2DbPmFciApveu+Hprs0g=; b=gsstKAdLmYhVMJGjnSPeDf5bpC6zPtFPRW83M43rjYWElV71Mo9nXK/iVZozdYuGx6JOc51L3RilGo4U533BddeWBXYDC1ZZt31KuIC3a/cxm57TydHbCiJ5RPpniij5+97EY2XFz8x4qvvoRBVckY7cX5+WmvZ72KX/wHZ1ZuAyLxaEn++wW8/xVkGy+uIksr6YoNrlTqfKs/YUuyfxVhgCjK1HoHa7Vaxv4YLUIblsiU1gYitaWL+XTeAOWmKRYX/Eo7DmoWgDs/lwZx5Y/mTb4Z0gQLZoggUmJtNLbAg94PwZCwVHAXsjoxZD4Tr9bdHNR4/tAk+gNwpYKHYDRA== 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=acla8zgY6i0evjN604hD4zo2DbPmFciApveu+Hprs0g=; b=eqnwDadqunJCliu/3zS0DTFrPBlFDmO4tw28nS46RkdtuzadB/xuSTcqvhlEPwL2C9QuDW1/DRGHeUdie+FcoOe9ZtrxyXxPGHvuVHZR9GqsC09dQA3Noj3CjEWgdGO0I3gVaFJX9O3LbljBuGOJrIpAuUzD6vHN3G2r6cMkycdYAY7EwjRctCpuJ6kXmIZS7cLA7i3XwAroIuMEza2XcBHGrw4SHNyCK3ehqnScxb9VOsrDK88hbc0nhrdM3GVCxvxoRLSUeTaQl1cN3hKsC80f5f7GoKhOy3v1yje4WxEuGNVjmnNVdSwd/wGz9yF3XAuOcP15EQEnpjqtIxn4WQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0228.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6565.17; Thu, 6 Jul 2023 21:05:05 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::8f13:2ef8:4559:907]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::8f13:2ef8:4559:907%6]) with mapi id 15.20.6565.016; Thu, 6 Jul 2023 21:05:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jul 2023 23:06:05 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [VB/LOGyQuD//Jhbg2elre/mmFPzLaLBK] X-ClientProxiedBy: ZR0P278CA0186.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230706210607.2161683-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0228:EE_ X-MS-Office365-Filtering-Correlation-Id: 80efa886-87cd-4e6b-4674-08db7e64abd4 X-MS-Exchange-SLBlob-MailProps: znQPCv1HvwVyACnTOSFL5V1xI61DDaSoXSV9KEiKU1nT4qQBWtJ0HeSKlUNqjKcor27lwzuKNpSMbGUri9cq568CquZaq/NnENX+VT3QZ9zjCLijGolUyOWLfMfaORbqoNueDWulSIyU9dwkJ+ZsxHtGlZ3kL0YUy5n5TtC4qyyDwwCDJcFhucXYNS3xmd3mG3iMPXHxyvCedJB7Xj/7JEcP9iJ1rP9rqEDTguZ23LgoHZusMHbhuejDTm+XkvV5edvqADiyIHiWFmVgcZT+RpbXnnS8IiONRmifLScGCCf/Q1qozcxh2hwK3i13vzhVrYPpf8zAwmIj+Jt3x7PtT0NsSBjks1kXDGwAcA4x0xLTGzd+SzPJxZI19nVymDYpLGktJW1xFucI8taR5tSeDYp6IY3qUIpsErdB9aj1cxm+Xh7YiAqkG3ZqKPfMLX3zRFGIUqteNHAQiCOqMhuwRGx0idtgIeuYr8knhCHjPQkbXB/bgeWfqZc4oEUXHWvDCW9YMAEa3PPtKvMeStRDD/5oYz0SEf6qxvFlK+duFS3zGFdl4K+afemS+a3simBUEoTu+nJvYSIr+JnK7zKg0cw01l5EsQSVW9xSp79syFesv365r6vcF17BYV+MZxLwjVCerQJBL6GoAkYMwEr9EhxWdVyAGLNw0nejVNM2/uTqh85lWn+fdYMDfQMK2ZO4VbwcDzwm6ZQKYMliWc/1uaBqHyx7KgwIYIizEZygGI6j2RlvdQyrhnLQd9th1ynGxiSQC/lWqoc= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xTFJRLsFjHH65VBUcf456+MbtLkl0KI/k3/YGbCg+nbp72Dy7K+Xt12fSuU6A/yZCIeRv148e8vh8pqby9/M4xcv9mPQNgr5h613QMK7Tc5ywyyyFssqH2fHI/IcJvqnORw3tHNAlOHzGGRF0Gkbv6a2sLWidIOYAZ1WPRtLfv9SJRTtKpVoeCMGTuq5xe6RlUNA9AzpdZZUGAarRllsY65oEBs+8HzZxwmhRl3I+p/Eb/lXC7nGrIcKeEXV0v1HPgnzf7u9LV9i0T8bTlUCizI1V8JJ10Pu4vLKk0FCdTGu/JlOWiuOYwGfdRdFl21BF9DpO9xANVp2G3ruXNf/wZ8Qgc/HvRJrzfGj7HK/fq1B8Qj53em3UijLR27+RD7LIV6Xj0td0dhLH/hZBmwfqnEPalGdQgYxqWyURtRn8zXKKKAP1rNaf3/ZNwLKlUE7yOsDxR8QBUdKKyx2AD111ccAQMrwkyzpIl20KTpTQTdgP+XbuwCjRp/cy8RhU7lCVeptasNvfcoDEPBPsSRQW4Ue9U1mGZPtzNBqxJmC9N2PK981QbF4HR39+sBt72jH8fFLulCHrH46yHT8yUcSNFISmQJ/5JZ+e/wEdwfykdfhu/o3ttdXyqvt/I/lZPNq X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xJPltsnAilWcG+1zzdFBnqVg9SEqtg7uDXjSxrVJY+2Mqtxcn4tcqqyHPAmB0hWx2AqNNmiCZw17OE1j2PkfiwwQ0riitstMv42jZlyLuM43D7/kPEZ9v05Va/8Q0jjymS/9bckeLOzbjIhf7ohejlXawbTzVwGpac5V0tbwk3WgDEUrQbEv0bfBjegt3UYnPO9Jn3JspyboHE+w+B0JvtR+G3IVXRoOffeAg2qoXh4nrI+lnt/j1r2VzvUe/SWlI7l1u5rnRsVYHel9ObiOF34SvTCnUB55pZwfJdptFRK+EzJQx+z5HFYLn0v30PsvqPKLBaT4NSMXfEahW8YdtWNcMwFFEC7wmoTrFFxfVuzacONp7YkwX3vzTvGeF0eBmM5CO6O5F6D94sfE4tbWcCBBhMuNvFei0ukNBiqFqBpTowLB9Pw0en7Rd0C7EvRjkcw2O6qqk5XrS2hAJDXBvnuwsnL/4zCK2IfWdWkY+wVqJAK3dwdnxQIZRwMTFpVA8fk0nzTz9GjsyuDBWnJdvC33nFhs9KMAF/d7xbklj1CwCCWwfPCllWF/1aaJWlQRPFSq9llgnIUBJnftIqZX4kX1VUVYOsZWI2hZdiyIdA+s+dX5j0OBFOEmVkFjSc97X7dqCcPO8x+x6ey4/oWtr4w9V5/+4/lXtB/4wd9Wcq6O5RFCqQAKH/Pd/jp1B4G7uDXM/MiC0HXZlCYMyxWLcgT2JlVau/KUvMuG19gV1yZ4YIhSH0fNKi/XvjajrsaiVtWywLyR7I3dnsJ30342fNPOAmKq2bGjnllQpK8nxWGFSNa6t4r6ClJkZXd3GfRbcPA+qMn4wFZ+/vpBqJWBm7Xly05wFaGtyVpwWS4pbpIIjfnJq4/a234bmyYGsm2wTJivCYygQhXGBvtXPHTa3OFvDiqd0mCkqHTRCFvYufOZX7U+/wOlM3WBbz7aPhbFZ3kGUiVgWeZTTSb6XdArG72WVZm4OynNntlpmWJuthXB2Da2aZMn3n3Hn1wDXj1WBqy8yAuaN1GAmvKmvwC3YIorB9DpV1/f7YUlFO4GXYsPNHLDWxxXeQpIn+pU690y7LPeFOrZa6O+O4chGiLLi++46LPNgV/vfPqJSlPUkbGs92NzW9P15yOqUyUm1PuheDVRnjctdZN2034NKlJmspW1xqBQ+1CQoVFYHAmr/JPI/WnvpyooddLwCOpdtDhOb0ZhYOpvIPHLZRq0ZF8S4DJ2v8slqv8QBgDH/vxW9II2AMre0oCuryXyM0WcrQIP X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80efa886-87cd-4e6b-4674-08db7e64abd4 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2023 21:05:05.0821 (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: PR3P250MB0228 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/evcdec: Avoid nonsense casts 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: 9bm9JDGaRJVD For uint8_t buf[EVC_NALU_LENGTH_PREFIX_SIZE], &buf still points to the beginning of buf, but it is of type "pointer to array of EVC_NALU_LENGTH_PREFIX_SIZE uint8_t" (i.e. pointer arithmetic would operate on blocks of size EVC_NALU_LENGTH_PREFIX_SIZE). This is of course a different type than uint8_t*, which is why there have been casts in evc_read_packet(). But these are unnecessary if one justs removes the unnecessary address-of operator. Signed-off-by: Andreas Rheinhardt --- libavformat/evcdec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/evcdec.c b/libavformat/evcdec.c index 73aab6c52f..9886542311 100644 --- a/libavformat/evcdec.c +++ b/libavformat/evcdec.c @@ -65,7 +65,7 @@ static int annexb_probe(const AVProbeData *p) int nalu_type; size_t nalu_size; int got_sps = 0, got_pps = 0, got_idr = 0, got_nonidr = 0; - unsigned char *bits = (unsigned char *)p->buf; + unsigned char *bits = p->buf; int bytes_to_read = p->buf_size; while (bytes_to_read > EVC_NALU_LENGTH_PREFIX_SIZE) { @@ -159,11 +159,11 @@ static int evc_read_packet(AVFormatContext *s, AVPacket *pkt) if (ret < 0) return ret; - ret = avio_read(s->pb, (unsigned char *)&buf, EVC_NALU_LENGTH_PREFIX_SIZE); + ret = avio_read(s->pb, buf, EVC_NALU_LENGTH_PREFIX_SIZE); if (ret < 0) return ret; - nalu_size = evc_read_nal_unit_length((const uint8_t *)&buf, EVC_NALU_LENGTH_PREFIX_SIZE); + nalu_size = evc_read_nal_unit_length(buf, EVC_NALU_LENGTH_PREFIX_SIZE); if (!nalu_size || nalu_size > INT_MAX) return AVERROR_INVALIDDATA;