From patchwork Mon Sep 6 02:27:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30028 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3373242iov; Sun, 5 Sep 2021 19:28:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzy7nWAmL+1sxGTdnVCM7vhZLXNNyD8f4rvAW4oHmufubRDJANAMyWwloQ3uRn7roL4YxXJ X-Received: by 2002:a17:907:1113:: with SMTP id qu19mr11389624ejb.524.1630895317990; Sun, 05 Sep 2021 19:28:37 -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 di3si7398612ejc.728.2021.09.05.19.28.37; Sun, 05 Sep 2021 19:28:37 -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=etG+LGLg; 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 91B5468A76C; Mon, 6 Sep 2021 05:28:27 +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 24D7868A637 for ; Mon, 6 Sep 2021 05:28:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qi1qU7qdSWE6EAis4EcoWHOxB1xChjQDMQQPsHV+oLGtxgFSnb6ivneODyBLvB/wBkCBvR9+RmFfkESodFV9O6s6JacCi6k4vLh3t7P2NlSN0TlSxJx/AQ5wxC7bPaK7iOLOzazknHuUzuzSaLkmSH8Ig4peMKqC6NOn8B45ZnhHUQWLEv1xXQAkKvJBV/0Avl/qsv1yY3esx3ZpEoBUo5siUxaW6fyWCghUntlbSKr5yMFLg5MFEFlYvHcTXuPb6wuxq+vA/n+E+aSlbo+M9DbqYLTSEihHDDu2zYSSm4mWZDdUcLdzyo1wPCq67aMSFPZ42aKjc2Jsib+u/vKSiw== 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=kyFrKdBSktnZxknA1pmR6RmLZnP0Uyeq6AKbEkXj53M=; b=VWBjvT/8pSTXUdNk3UHHcMhOHAZZgEpBOq5iGoAA830aEMj0i5Co0lThN6hFwTZVkEnMFPTiUbnB/C4JeyPmIjjggaXyz2MpPQBmac7pN1kb6F3NwBcobvv95vqiiSVHcNNlhsr7mAi35Blb2+G23piHhtRbEKKjSjmCnIv53DIoWB3KOlfUfnmKgZEPjZ/cqtOjW0HsLkSsojJCuHmnvrhFTW3zLtWMLbReLSehLoSdwd58nscC/jqNTfROemaYglUUYSg5SpyqLu2B8RVaIq9kQ73KCTY8WZr/2buXCdO15VszOv/Q73gIoUFzbx7C4u1TwzjwEa/NephYzIF9qw== 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=kyFrKdBSktnZxknA1pmR6RmLZnP0Uyeq6AKbEkXj53M=; b=etG+LGLgbR+QymRmdC3TKtwApjNPT1RY/SUl07jiSyWPih6+BBeuYossuICxo/d2PKUbUv+PcaUMNicNCX7U3YgXzsPAzPY2SzptOnjaOkky+7LRjbSUj8CVJwkgEGoOPjeJrAIMl3N7IwYlyXFbbUgI9U2hiWIfckwNy+TTIV6gJJPzAcQwJtUJYBO20g6uJxvyngcb/Df+3f/eIYN6iQjwKvXbD0rDtdz4dXW8P9xWnFkr8byM4RYL0tVxSQkjQN2wUpGT2oWy5LqUH2aiGVPPkd16nsTHiaZp9jv8OyYHvx0CtcmL9wsxx7gj7Qyek7WZIvxFZaOp2DQApBNzEQ== 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:16 +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:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 04:27:41 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [5T00LbV/dECEU2x92Pj+Qf6Wq2SdBadp] 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-2-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:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ae01c6ca-9739-4623-36f3-08d970ddfbe2 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuzDfZWnnqn466TZwHdqYFi/1Gvx0nngQZSwXart6mFRYoxnhATUS0IKpg9O6WTGFbFf9ezI2BeB7ejvgW+h4EsgftexUz+WibcUyRtUk00x6aXG1C6ADXLVM9WCm1Grr3B2EztdMa/ATLbN3xxWch3o+WUt8yCVFcSGx1g/RaLOjMz6QIrGmyBZ50tQs0PFV2ddVjFv9egPstS5Mu9638cjJo5ggnRPV4RFvw6LCLHnJp5IVCOHtJj9Rx6cDb+6hi/rjohbYY+g8trOCfmLxdeIz6rz2oSeEvbCUVww5fROTrpArBVlRHPjwrOQP7NryEdWkqMzDZoi0BmKVkCYaUPfUyEZsVHnbbC38SiJ0RpvTlmlxLC92e1tmsXyEoDflotOVt/crlfjGNblcXvTdn6+VYy35n5ZqZRYrtfjIFI61ZBxK8vQEhYitYPTD2zIZotGh6AXj/Pjn9kd4tuPikSFCd7kCm+UQ5YSeQvlf1jt6JHEqZlkKTeUAB9sQ2JeHMs2zQHZKbz/vnEN2sdRCshtv3DyYHLSSLjpOY4PXWCBlyFPTtP3Vl4XfXnKII2jS5JmyIcwamfH5a+CL2e3viUBgjTViP30dMoaXdRe3pi/Ln1usYuLU5vI855v1Nw+LlSLmP9jmwM//cxiCNcVBrHACx8YFFivy172S6Kcv0llKJZx2IS9uYXlqAH/YQlfMC8ce/ko+/6z1xw+okcrFoKKzkCgV+gFBGmzIvLwLxxhUwk8hgjNNfzOhHy/ZdaqXROtYSAqFP5I8uzBN82gsXh X-MS-TrafficTypeDiagnostic: AM5PR03MB2850: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: L+/VuHPHjb4wIb38FtX/UJBn8jf0aVMtjnCdll9hFDU6iP8a7ZYCy0EvjTWX6UJdABTQaJU65BNlD/oksulpOu3l3Hsea5R9PBOIhOQnOfpSc5Q3fH1npcwBJpQCKtwVyYuyU+Ic6idO/h68K+JQfnDigVjXuVcTB7MPcljzbzmOCmeGGUkZOyLHnlzQbUbdZAiwsuNdkUFp5gfZ2cUb0z8mAfphB4vZK/RcnWIWFlDSRHsA+/UYburLD+56CkteSgJEuSWITEHMET3lkbZqm+62fmTRoRZoDNdYnbUY1UkBq0VvwsCtwGDG0Bz+2Ze/9ZNdAWOpeHz6+PeERFD0JzOHe/VMXjioGB+eFeKh7IZCC9uY3cf8aZwe+VAx9JmEYbOqJ3mAmQ8NTmE48rGYAgPyVItZLrUeT+kF5nLtmrlLPFqP5YdkltVyelk2bzMm X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DuxW8jyCdNRrSZaZskn88zkGo8ZhWylucaxr0TMGiB6cWRE6ocjdZsQ3toylNuitl4KktGMh/Z2p75vEWzBCg7a8ptRyvQdjnJD06VrQJBfBCxjRojPksX3MqCNSYravJ4JAg2BdRKvYWshnVpuhLQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ae01c6ca-9739-4623-36f3-08d970ddfbe2 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:16.7825 (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 13/34] avformat/mux: Use AVFormatInternal.parse_pkt for temporary packets 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: uXF4CPAQUeAk The documentation of said packet ("Every user has to ensure that this packet is blank after using it") perfectly fits how we use said packet in the generic muxing code. Better than the documentation of pkt. Signed-off-by: Andreas Rheinhardt --- libavformat/mux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index ea298c1221..7373fcd1a8 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -1174,7 +1174,7 @@ static int write_packets_common(AVFormatContext *s, AVPacket *pkt, int interleav int av_write_frame(AVFormatContext *s, AVPacket *in) { - AVPacket *pkt = s->internal->pkt; + AVPacket *pkt = s->internal->parse_pkt; int ret; if (!in) { @@ -1237,8 +1237,8 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt) int av_write_trailer(AVFormatContext *s) { + AVPacket *const pkt = s->internal->parse_pkt; int i, ret1, ret = 0; - AVPacket *pkt = s->internal->pkt; av_packet_unref(pkt); for (i = 0; i < s->nb_streams; i++) { @@ -1328,7 +1328,7 @@ static void uncoded_frame_free(void *unused, uint8_t *data) static int write_uncoded_frame_internal(AVFormatContext *s, int stream_index, AVFrame *frame, int interleaved) { - AVPacket *pkt = s->internal->pkt; + AVPacket *pkt = s->internal->parse_pkt; av_assert0(s->oformat); if (!s->oformat->write_uncoded_frame) {