From patchwork Mon Sep 6 02:27:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30015 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3374182iov; Sun, 5 Sep 2021 19:30:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz2HEQTD75jdtGFNMJquLUJeNJXkIf7FhW5SMgmqyLgGIrz5xG3ixztnaohGeSUIHsClrsJ X-Received: by 2002:a17:906:3708:: with SMTP id d8mr11316202ejc.310.1630895430786; Sun, 05 Sep 2021 19:30:30 -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 16si6646760ejj.242.2021.09.05.19.30.30; Sun, 05 Sep 2021 19:30:30 -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=RfHs0+AV; 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 4345E68A7E6; Mon, 6 Sep 2021 05:28:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066075.outbound.protection.outlook.com [40.92.66.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99F7068A790 for ; Mon, 6 Sep 2021 05:28:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AF+oDI8h39RzbBy75Hs0rYrujAu2x4vlShDWNQKmh604uLsebANoYkx0yaY2Cu+ISwNOvIaCksgOHlrgh5jzhzYwgHxi5r7ZZf3WpFGQuk+rqohwteNky8Cm516LZtfyAwnkiUcMVZZnnWbMU+pTn5SBxRcFTei2EdIFS8N2zbgUz7ugK2bSWgPtb2QSQ1A9U7KmqiioU1f/vdVqCgG5m1DQq/WbHb6ieodIGbsPB9Lj1URz+tE6ddVX7d2OxIM2goXmpxszPVSlIIJswUAQAdPk5Ohg1iDjMfw9qsNVU1lwgIYWGRLg0p1JZv7wmEqZNaiLhbGQo0h9AwGznQ69FQ== 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; bh=WbDeS8spyb6BrPtlkIheQ0zn3Ow09wEZLmVswM0Z0Nk=; b=b+nH/uSK3Gj1buKMo04hEnz5k06V0u/BtxBhhV2YVnpRC92XqSv2NA9THCRPqcZvZtt5z29QSGEERckh/kXeUYpF+Ey7rqNMsjGSg1QFU77G64SdUGrkQwoh7iVIP/ulmXZl8CVhBPFnwCA4P2KzIylHhLT5NyBNHbrAjz4M+2PLl7SsvWIbw5JUh7lqreymQwtwrWNeeQoVXoEQjSElhkUzwv0DEpqWYsyjAhsRahvMVjyJM/nOC76FcBTzotQ2esn519SBuwI/G/DXCnqf6YjmIw7G+fQDcKm14tHqJnXOBHMTn/JWurJJ6JsMVm4P14uLs9GnzDHhaorZvrTcFg== 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=WbDeS8spyb6BrPtlkIheQ0zn3Ow09wEZLmVswM0Z0Nk=; b=RfHs0+AV6tOYhIG6D9I9kjziO1OeSpdWjNNaYtAsn8Zx2Eh7q1ELxsdaOaWETrSiGOAP6l1zsB9q9BifGX0oDzWShZwj369LOqtNA/zgsVDVGg0sTV/YTAmw1qAR3YzfNd74qlC9r1IhcVGZJoZxh4H2WmBGnFdnSL0khhU4uK6SgKjszn6vRYLjkeJv84mHlZJNAbJS2eXcjgWZqhAYwd5gcBXSauBKYG4znmUX8AjekV2NNtB6AdntxLmhPgmvV7Tdmy+paK7L0xgru36bySxhDD9KlSLxu/WVTgtjiE/C8EFr+f0jzmin5sO88hSPlvIoJYNPCDhInw37ECadZw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB2850.eurprd03.prod.outlook.com (2603:10a6:206:20::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.24; Mon, 6 Sep 2021 02:28:28 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4478.025; Mon, 6 Sep 2021 02:28:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 04:27:52 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Zd7OWpq+vqvTzZQg0WvSmQbt6GKEBXSG] X-ClientProxiedBy: PR1PR01CA0033.eurprd01.prod.exchangelabs.com (2603:10a6:102::46) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906022802.4072793-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR1PR01CA0033.eurprd01.prod.exchangelabs.com (2603:10a6:102::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 02:28:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1dc3bdbd-ba14-404b-f30c-08d970de02a2 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuzDfZWnnqn466TZwHdqYFizGzhBlZiYO+0hJq8zknrMFEVKAyE9Bno11yD1BIbtNc1wMaErcYq+FhDIJj5nB1VN1M8fvqFhPAqNBhihpUyNoZEXqBMLpEk1xEu3vfEzAFlvPYTZO7W2ppuqrRYpqKx/Iiipulg43ZIOk1bC/UB1ro7U4X1kEzQiEZ2Etj6WSOHeW5g5mnJpJvV4K+TKj71eT/PRI3j8t4K5epQAvUVZm4vMzkSacOz7GLNMJhH8NFE5jYevNKW0udhW2pMlyCVuIFb374MVPxg7mMFpvkDfeZrWluB/NPn2HHav13LnULAf++PIIgI966xuefa4ZaoTC61YxlrWXgepz8TLEdIUzDLTecAN5N2Et+ouTdhN7cVWq3Ivx/aHIRH6wlForS4tyHeyyJSxAm14XBBIap7RZMlpvVINLGFueIgJKqv9wDPNfrMiNlRdiewJD21KexZ/MHUOmoaa56NVGlvw1szM/NaxrwT4U5ftamDelrqt35cc1/jgfRxhlsTZk/GPVDszmNJ4CphYNsg34Ii5uQPBPCyuOPmzQXKYXAUVtNgRdz3eP3mxxxPU8sY4wZLvVKErCZtL4jB65k3VK2kZpw0+9W5nUGVxS8tNz/i6xgd7Le1YAbMvvQiQm/1J9b3lz1EU43fqbYACwPwoIYsuD20bIV/zkiyWy7FdCUyzJ3rFx/o6uJQ6oOVUj1ob85spvRIa5+GcOytdcF+e3s5uj1pAMY4MCD7ANOnF0Syhd8TYfV5QV0A5n+iLduBjENAMvjW X-MS-TrafficTypeDiagnostic: AM5PR03MB2850: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TcOb6TVIacyIvQXOxDu+RTZUIRTNvfFiOcVOnmKxouA1aG4Ot45xqL1FoTNQ5IWLStMq8ZiJgZzGc+u1K8kKMoTgujVPE50TdDXPILKIngCGpYPibZM2AqA+Rr1HxKchiwjkjCuL3ZsXfWp732UuLSNwdDu7xbAELu9oRcEiywQkXc58pVMXuuFRVOzh/Gsdxj9x3zbmk/efQ7beOkU9NnNLSkewM/8vCBoQveSkEPTmaBcnB1Y3SbXEHsdQYDWTBplOyKJa+2wQtje2D31oCKgu8d0gwGLYOpWEE6uXXvW+TGkPpw9SpJK3Kx6b5B9mnlM53+ATUg2kI1FJB4UQMRhzcPIeDP7dKXyDr139vnQ8n9A2eWVlQiwV0aeT4nqwQXs6LNZNzEcdpvnu+jLuNm5p/gdKb+HfJUk8VOerN0/TAJlhP2BN884d9yhjFo6Z X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WvaYSFi3SMgdQ9MM/LRBf22eM0kq9bMpduOgqOmpt7QrFqR1ikEH8fLPBp5Hh6DTknxdeaM0d/zFfbJOPdeUncDX+wFT/HbgU4OP7BSCpPrSaYhgwUBVJOPRD5FDRB++MYxQZBG5ANG+Yc6N8oVqBA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1dc3bdbd-ba14-404b-f30c-08d970de02a2 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 02:28:28.1419 (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: AM5PR03MB2850 Subject: [FFmpeg-devel] [PATCH 24/34] avformat/img2enc: Don't use sizeof(AVPacket) 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: 7ztzkCD13W9i Signed-off-by: Andreas Rheinhardt --- libavformat/img2enc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index 655595374d..944e055e12 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -77,7 +77,7 @@ static int write_muxed_file(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt) VideoMuxData *img = s->priv_data; AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar; AVStream *st; - AVPacket pkt2; + AVPacket *const pkt2 = s->internal->pkt; AVFormatContext *fmt = NULL; int ret; @@ -94,17 +94,17 @@ static int write_muxed_file(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt) fmt->pb = pb; - ret = av_packet_ref(&pkt2, pkt); + ret = av_packet_ref(pkt2, pkt); if (ret < 0) goto out; - pkt2.stream_index = 0; + pkt2->stream_index = 0; if ((ret = avcodec_parameters_copy(st->codecpar, par)) < 0 || (ret = avformat_write_header(fmt, NULL)) < 0 || - (ret = av_interleaved_write_frame(fmt, &pkt2)) < 0 || + (ret = av_interleaved_write_frame(fmt, pkt2)) < 0 || (ret = av_write_trailer(fmt))) {} - av_packet_unref(&pkt2); + av_packet_unref(pkt2); out: avformat_free_context(fmt); return ret;