From patchwork Tue Sep 20 16:46:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38105 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2068920pzh; Tue, 20 Sep 2022 09:47:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6N5D/1czbeCu9UaCoyqnFP0INMcVnnGXZsmVs1lGOtdBqE1waMiBjkx2dmNypWFKOI9kHv X-Received: by 2002:a17:907:94ca:b0:77b:542a:4cc4 with SMTP id dn10-20020a17090794ca00b0077b542a4cc4mr16892033ejc.257.1663692432551; Tue, 20 Sep 2022 09:47:12 -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 hp21-20020a1709073e1500b0071200866b78si179994ejc.689.2022.09.20.09.47.12; Tue, 20 Sep 2022 09:47:12 -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=O1bdYoPK; 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 0F85A68BB21; Tue, 20 Sep 2022 19:47:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2072.outbound.protection.outlook.com [40.92.90.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1584168A6B5 for ; Tue, 20 Sep 2022 19:47:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z6Qy53Ts2cspRiH+5WRHHhtqvBLTCmlkh96UD2EdnX2n9x3BcsV454i9QOZwyctiMv8+DW1pZAKKX8mErt9EDS8WfvchpXsAKPj1Yev0lfcqoqnGQH0v3XyNKuwYIWWLtAfxLXq4VFuj00veKq4gPCV4haElrCh7qJybOURTOx2H8yBqlm1t1wld0mM47KZC5cLX8Vbb9mIVsGyNBWvwGVcOFEDYmLS2RVF1IPBgXT0I9TsBocaZDq84EEHpLTZsSlqhpl6sV7Tlsy3ni3rKYXxQBqeljyhEjZ2sgf4OYK7TOizshiruWRXpY9S8/uGvZ42QuRjqpldsXPG7Pit4lg== 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=HqEyjEWl4KiqBHZjzhuqdDYQKlfVpFhBpGu9Hp+HjcA=; b=h4njD0avJ2eHMVLdOwloOBbdKtjC+Worg3j8KDxOyGVnYYmTdB36r/YL2x0zkBbql/Z1uCQIle02XAHIWIA27KkaHCUGHSrOPQLIxAa4ciuFLAKAf34Ulgr/Xkl8T8ZQu9E9FXKs6at+PxjFrGz+OSp6gZpnWz7Q/An/aTJ51hLlqZBC5cZ1o5O3X9PEr2+CMpU6NYgorQXVPOsAt400cmJmp5sEG7c5UNpmjRS56PDU4yxvWJBYxGZxIozr/2O8AbDa1KKVzkuU9ZfTZzA/kc1ImAvYJWuxlFxyujRPSYR9SRK2Zme8Wg7kWMUuBeVfpFwr84pwFZLRI4E4FcOE3w== 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=HqEyjEWl4KiqBHZjzhuqdDYQKlfVpFhBpGu9Hp+HjcA=; b=O1bdYoPKoEgu+ZoIUURgrLZGjaMZrDgWeScRWpd5M2TuS1jA1YVlWj+z4oKItL0XN0W3FiI/pkXa47fbtwapEhA6f2a3opPfniH4aOgLTR+dQzoUjS/zriuoAvd8g+8srmGySwSC/rxPAWjAEDBTIw4aOsk82mMW9rG9lDzGDbJblgssF+nL4Dzrz1VvCRbCJgN4tXjMSAobXyKeLY7kNlDLgCBlBkwNsAKhgiUbSJnBLaXMiSkvRKvH9qlrn3q/Gtd0iNbQhAqnkVK3BiPqWGVzD8lfsZfcLLJCP2k18DWS+fOawb3WSoV60NM91TRlZxhzbTGx1QymLEzLL5WFAg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DB4P250MB0981.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3f7::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.21; Tue, 20 Sep 2022 16:47:01 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785%8]) with mapi id 15.20.5632.019; Tue, 20 Sep 2022 16:47:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Sep 2022 18:46:44 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [5zVhXR1IFBxUBWmdw4a7RhlAd6fmcRcBMyjGzjTa4xw=] X-ClientProxiedBy: ZR0P278CA0168.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::23) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220920164645.4006844-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DB4P250MB0981:EE_ X-MS-Office365-Filtering-Correlation-Id: 787de595-98d3-4192-0b91-08da9b27bd51 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmrSLXKEIOho5rAVFPd+Gouz/nKE8A14cfxJkAgAzDN4ueZHPbIsL4grL1eY0zDoBpFqj63iZCkKmtSRmUQ1vyA63xve5/bd3pQixV3R6Q58Q7g9uli0w2oE+Z1yY0wIV5jBwt3kHQCpnZMVXWa/TkOhGrr5T9TRZzo5093GVWitG0qaWW0PBsNdovrt2hoWSjbqIrfCcEkWjg+a6YUbZ0Dn33gkjyys4cqpWVFc5SXqhCHV1ndw1uY3Avk0wzjv0qMlzyhwHeYnVOClJzZP5wbdDGeFk4I+FiqYcZQxsc7jn8oFLfv6lsvO50sGuFs/SVEzjoFIQ0VLUuK1PPxCtoTH7zUT6FvdQ1JFF6+OvWZd9ExsQ4b4k+cQXgTTkYGxVNaYGk0alJJe9tUUcQcQkXj/yRLDSWb6pFBCpCN7TeIgU6XSBNvwygAJepAp9nuuP92VHWAxXiY5lSS157F4/jF2+a+c9pujzMzkwz/GMi7Pc9uNLVauyGnPaNdCFQWeh6JVHELU1fmG1a8iolxFhGOL4Yi+tNcLOJ7GLaIuP377uBNWVwu5BBnR82eEuGwiyuYwvze0az0WUwegiEklU3p6naecbi+HtvS7YF5qXaJEUfeXuJ4oAYXGJkznC8pFFxU5neWLVvRm6ux7MoJ0bFklx81Fd1/XvNM0hHryI1vOEpGu7TOvQIHCR+03FZ1Y0vS4W1jvJnrqzfxX+F+0BlCXiot2fydG77kX0ACFkhQQSq5PSMUv8pTABJsx0XJDnP4= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TDouSJSZYanJ1rZ8MlwXJmf6zNi76cCqMyXP7hHcGrwMl6IrxnVKkg/695GgFDXGeOJtfDQG6LKiwOYE8KgGu6i1/5RFEyeiiRKYf1lmU4VkXFroU621XvoXVTH55w+/o/2b+R0yfoG/adMBGXblnfCdu0cJo8gwZuLKqB9lPe/x+GkKxEu2t6VyvxfTVY53etMQMUuAS5gbvRe1VR0Ca/cripUuoAeoEj9sti8pScaYBmQdTE4xxTfiVxM9EqzaAFFERGMTES68H569/JhhQNbQXLgLnA3xxFmf9W8RtL4R2zS5a0U8bfFK3nDFWlvYYYiBtNu0z2qfBzWp3udDnffQRuSx2HKJ913xfpvhdO6Mi3ptuB9aW/eSyqrA3ItNJTRk3f4LpjCcPnVBgNZLmj+iAau1M2bWH5YGwxkguQvsLQlDqnTUGjQdlHVU3KwnsaCwzZBCuamy7jY4qcGGwiHq9J0gqUE5RsDhSTgnvfO7npny1JJM78rWeQC9XLz/5wFCUSHta2hjbDVU17821fWe9oQ8iIxTUr4CMkpRyLJ1bOfmkQPN0cL27VecwVD/gH+g0pcz7CelYtpqzCDH5yO/sr8o950pNYB0do1tkmDcytJrqlkFS2sKWlR2j1Cy51b/6MAVAEIJrlXSxaSIhg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8Fthh1ML51ED59YjPG7ii/SxoMqnhqNmYex9n8xd1QL3bE7qghZWzOB1TvipsKfIi4YbZm5apcpHjmyW3aV2Y0TgYxzmHWyyC3hDz44FmdsgJSbYMYWDmkdL7s+3fpvpr917nAdnszJq0tt/55hSIX/uP40CzavYSnW6Al79jGI8gJBPQrBnyvMuCcHNXmRdgelmsCvtotYsvQoUZ6gu2f5C3AVLvVrKTU37Gb/xmbk/2FIteN/MHJ7v1Z56ZPSH1iKD7aJXA901JQem6BfL+1qTTxd5/HyIdb+aykygHsfcA4gYaBN8CWgi6zZErHu3zgQjv1AuSSabSf2HXA7Cl/BIJhsoa5Lab+KLFwpJPuBxW99ARS+ZhL0zjzPIYMno5mK0sHEXd4pevIEp6Vcchho82bNdc3hJc2xX7kp1FfxECI+tGIw6/OVsfD64kLwJ27jLc1Sm4dcG1XpxmHqpyV4bLC8Ng23xMDjsvp8UDG1ayg81t1z7nRK6YoNqYe4PgQzbXAzQwm6GATd19qe1BD/7bFBFfsFMaMy6Yt/uRnm2O5mlKqfCfXlLbwZKPXDJZFb++YX5O4Vnn0IdqJyHEMGv2DR4nDvnM/3b0ZxHhAUGr2hFeK85SSoQ747vQIDwW+wRHkgfY+GHJGb9X7Y/ETrxbNr96NuVDMBtb2iKuReCM/vwiJbdguxXp54QKTz86EAZ9+4L/SetHlGelzQIWu95GbYwjjAs0lB/7hqRwSAGdFmvy/GUpCRtJ0sS+aZGyITidQ7FJeAhBcUGEjhnMZy3tMr0COK0qOkWKKO/O2kYdoWv92jrF2ck5ExGPt7yFRLbCkePl7UTCty8wBq8qtttV73poErWcJPTMKOlbbko3oJegfSk2Hec//gWgQJXQG82RRVXLqMLyNVW5SuQj5bj9cnenJqlxG+avy6oZ4+7H2MOrUr6hShxDosJJAYX4hlJ9ONvIDwzwvvYBux9eGscvY7C0CAgAWu5HWRt9M5x/TxiAVSjfP1lEEytnGcEmMc0GQeshi6mh3iB+/5PpAJSOJd9TanGGncL4E5SdeRy0U55AoLJyhb9KnScBtR9n8W+X9L/OUR5wcI1gGvN0utuXpFEXGNp7cEQBTVc5fzbN98c08CW7L+tS2Pev+1G5UEs/7/HDsNWV5l1sB5rCP15xbQYFSuYJePJ+7A4xp/tqLEcyeOXqzAua9xJVA2MOgLXxPM2YJCNRiG9JyDyPxvo+yJCPoC70MCx74zyDhMw11STqwt0Q44wrnK0k12sjwHS40OhBlRubwUWuDAKM8G1ppxLqInyDVnPKRxzK6A= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 787de595-98d3-4192-0b91-08da9b27bd51 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2022 16:47:01.0768 (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: DB4P250MB0981 Subject: [FFmpeg-devel] [PATCH v2 3/4] avformat/nutdec: Don't shrink packet size manually 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: 1C8YlTx6pzAn It is unnecessary because an av_shrink_packet() a few lines below will set the size; furthermore, it is actually harmful, because av_shrink_packet() does nothing in case the size already matches, so that the packet's padding is not correctly zeroed. Signed-off-by: Andreas Rheinhardt --- I was about to make append_packet_chunked non-static, but then I noticed that it unrefs the packet if the end size is zero (this might cause problems for side-data only packets). libavformat/nutdec.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 8cc56615ad..1d04f51d8d 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -1127,7 +1127,6 @@ static int decode_frame(NUTContext *nut, AVPacket *pkt, int frame_code) } sm_size = avio_tell(bc) - pkt->pos; size -= sm_size; - pkt->size -= sm_size; } ret = avio_read(bc, pkt->data + nut->header_len[header_idx], size);