From patchwork Sat Sep 2 16:21:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43490 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp254976pzb; Sat, 2 Sep 2023 09:24:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFfIUOUkdhHy8ow5pSJBJLanlsFtI3X82hdbg/RGfF+xJ42EfGNxvKwpykLQ7zBcysnv0FQ X-Received: by 2002:aa7:c393:0:b0:525:570c:566b with SMTP id k19-20020aa7c393000000b00525570c566bmr4044607edq.22.1693671885040; Sat, 02 Sep 2023 09:24:45 -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 n24-20020a056402515800b0052a49ae2a07si4043796edd.156.2023.09.02.09.24.44; Sat, 02 Sep 2023 09:24:45 -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=tSfjlXKR; 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 2DF6168C7A7; Sat, 2 Sep 2023 19:24:42 +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-vi1eur05olkn2086.outbound.protection.outlook.com [40.92.90.86]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41AF168C3F4 for ; Sat, 2 Sep 2023 19:24:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KYmVLrlIaZEyPAb4mwCzms7fIitlWEGgmrsOOB9Okr4nmaNQdqHRgq/Hrj7ChcL/f/OOUvNFQyrVA2dtoNgWGSwfPOSYfyi1ck4BHOxZFeyQDwCkjUEqvCayb8lrVWK9f2Fjifr6vtSkGA1GHtkx1MFty6ZM81gxXQztJggNSRDb6x2LndbtmBZ9tW2gHr8H1s4Zy0hJ8nqOrDAGec4EClc4TVwz/nDyXsRZxgeuLbJneSJ/sdIwjAT2moWv4BqDcsCOgtIefJoR8w4T7dI7iqzsVIspQLGMU8yEnkPBqKxMezIfh17x3a/lfiRMVvW2zVWwxNQJel3931nGCKBALw== 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=R8FpJtK+JRI/SW2vzR+rixEN19MaqyPDaknt4LRPqTA=; b=iS8IoFNHb7p2Y3H2rV7nssMakULRaY4N/CxYBz0zAW4W67SmjFdQLXZhPrFu5qM0VzByX2mO+HJ1jefSgfc60g/4PK/9AGFrU92Z/t8NEmDX7e3AeKkymc4OdH/T9uSjht0R/yiymdaTQCo7uqPjchy+WgOWYTJmvteXqK00mVIxgjbVUscC/lSNqaxKWEWa+hYWe46Q0UrwSBAVkKCMQnxRgiuRFYLpqwNyW1DesaE7+hDzFDPILau+K6ZXEsk7vEEtUZWrRpyrE+A3uualZrTA4lRq8A1AP829L0STsaf6zPKe7LKn1O8x8QL3FYKNbhAJFWSWBE6UZF+iAEcmbA== 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=R8FpJtK+JRI/SW2vzR+rixEN19MaqyPDaknt4LRPqTA=; b=tSfjlXKR+2+RqCSfc2B/LSfS4cyVtbQpY913c41FSXxQzYMaT64ZkIcYRMeYIfIAdrvo6iA9p14Zf03MBSH/DDQKARqtAqIRoz/n/Hd6XuYGOHDiTrxXSruHmO0zl/SARHaCiWsDylEWUGuhujhsC3UzVE7e09dP+8axu0WzZ6cnBInbv+8xIppawn0xxL+f7eZvc4H26Joy0A216ZDkhyD+kl+H19o8htEVx5v8GV0ai89T0kjC2r5qk/QF/yRhWzdoOJu6LwGkQeXBqi9HD2cCmIB3fw/4MTcAc8WyQ2XgVssdrsv9+WAadjG/syk81D49k8y+SkQpymvgn8x0/g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0272.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.28; Sat, 2 Sep 2023 16:24:33 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6699.034; Sat, 2 Sep 2023 16:24:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Sep 2023 18:21:37 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [7swCLiHiXJh/Zg8zNhXP+TgZYqX1gFfbv6RBcR7oSLg=] X-ClientProxiedBy: ZR0P278CA0071.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::22) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230902162141.1294387-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0272:EE_ X-MS-Office365-Filtering-Correlation-Id: 6af4037c-e630-4e2d-386d-08dbabd11714 X-MS-Exchange-SLBlob-MailProps: 0wLWl8rLpvuzPRaje3DTN3aBBcx7rvSmPHrzJgulL/9iW5fGJszcPIRmZyf5XryKkj5M6m6zBTW8R80Gcv7RaCzXAEu0kv3NNtxJ3CfFs0It7KFQiZfM1XT6B42EmRWJ4WVY4W7fVIujGWMqdOrM759jttE0pwT26gU7CXdFoAISIW1hjXe4lsTKL2oRr+sB2oPhSCg7jCJPUZtpS+h0Pr1zCgC+CURN3jYLPni9ZC9NSMFgO7yndCvmjw7K8pzAsDEitZFVQ40qodcUzVqo3ZHdoGgvE8rXm45DMMUxAGOtOlP1Dh6262ktTSnmO1DNlLs1uLcBIB0QzZhStXfecA7wrc84q6WrJAgTuWAd01crB78exXnkfZo1MQpegATCJT7+LKlUXiCmAihlVKlVvhmHzW1DM1mPvgKVjzXJrancR8tN1I7TsPMrGsK4QiQ6It6ie2yiLZFxxfkiHBstabKU+i4rhSZjmxyMMOzoe8rx8HNhMz9UUBZRl2oY6V0UrRv8ikb6Im4492kO4jgUUhU6NTRV+ltZaGeLJMnQKvozdt1pQtLWn0XCtXytsGAPoBe0Sybu+b5CwNT0SA5SRFODEYd0V39xhqUgt/QDRQVRILcobmYxqxoPCrItrZJMM6ig7C1mzr9nfJaRhMCd4yyoo/x1dO4zFMtNe8LU5MelwHKsMgDvnomeaKgQNlveB34FxCwRGH+Q2TtxM3v88B+FqBOv2Mk+VLTo9fdd09b0YX2uv4x88hpCD99/4qB8pPfxeJFcopc= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yfXm2s/s4tjc5YakrgTPSI0Ro1NvXHIS0TKm0oJGEgb1Elr3n5EUCr9z5W4r8evpjb1XNMRYrMTJJ/045VqLYjXCBbHN79655WuoWTPU6e9h5j6QaPQ4kyuTSWBF7Japv9FySqMMLelX6NDtnUXgomCS00/1UVHEDONi4iNZgosDPCpyaZ4FVY7ON/vcrw/sb2B1/QuArb7kYjutTS9vJY5l9cXdK9YDiJkq88HbVuH+lQT8MDchob1RC38T/GeNhLjDx8C6hmn9ML7KkAk7lDmRobsxNY4eco/1OMVNABbus/X/rRQ6JvvNHW+4IuAVCJWP/FK/LbNHhFOkA/Im5QbmqakJqIiZA5glw3O8E0v4o3cYflGCNAFD3cP5gChl7Zmr+wNQg5+tkU9fNxuk1bhSfLnzhpySAK5KYYkwSjjvYqIb0WjSFo+ZaqQR0WjbbPStYyzIA6pdgIsRhrcD0qsz/R08greOX6sVBaPipmBQamJMssERG3ZUa7u2+mE/0FcQCt6LM5ee/y8YqeqXZyzCARBOpcQf+fJ51LUCUaPcok4VaBrGceFUXPJFl6pPWp9nvqiPMj5qrv0SupU5MT7rC7cwsGMVF8mDHWuHZWA= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8puyDvnRPb7jS/262VJlr2Xo77wi6Qoe/EksUHXCfREMH4xdXVzZNILD42biz+BKe0ccDtm2TaKx9MFxS4dvGZqxCclbN4VXnSPulTmSoGpRtVaJ/OEuI73TMn4OLLdzkQ4i0kbn8XFjTirG6Pkauv062qS1ySBkhvk697Vx5CaUWBiP0VtQnsF8qaXp3Q/QdS5dfgzxTQ4RpQ95krK9SEXB8hW8Y4FbjhyGaozWz6ZHeIibVC9Ce1l4UllNZjfqG5f/ZcEkdtSiJ9hJrZfpSZcCWf95TtholJXZ5fMeWFBHMHCctffv2XGxLCn72P+rSJoFFhdbUrkzzTyY2gbipCyMbHov0a44Fgd1vFCPHDxhgUBrjdupH8i8EDsCr30hfn7FLBtLSp7e+7x4DnxHGsMSLRaLPyyoJ++KepFXdhE3RxMYWpGUyHDpKksWJDjpXht9ybPKeLUffQ0p4CSpxLJfZTRbStS4JLFqsJrli4/Fp17s3UuvKM94lzJG54KFUi9n3N+NqwINHN/YOidKxgqH4kNcnoOFQUjpOBNoqoLdv64t6AHUVLbVJsni9x2fHhFT+S0HKp6NkdxMpvHQHsVEgguFM60RA00ZVGJb8Xf3tswJfwwns/Nf1DP8oaQLjyeR+nfTt/Yn8LlZg5WUpAUthqxqXkrgcvhDcv3kYtdWjvqX1s0HbNv6FLn4VQ48ZK2yXN1nwk/9AbhNc4FB1QAzG0oVGVdgxKA7jXckQZBdoKPe7V0IzvCgbNDLqzX4ABBAu1q5wwSqQNN+52qsM57hk1MoxKpwGyrsyztJlu7xOPkIy0rfXPzZzyq6zrFmd6aPY3O93dngzlW9D99IBlRhohDCcB4UY62Gc5uP2dC05V5ztMt47O4HPFy5UvFJQ/lxjNk2s1IuRbhp4bEnQSg8rGIQNZRlqUyl0o5+o4Z2NVpwbMsB7Z0BxiyWF5UUjoDtKbthhx6Vj7rGcTHNqz9L74zsl9LRXymUAHLxXEpQ2sJ+p2PcDHoMRO/K3ae74UfGgTQpUa7XynN9+AneoUvruk+77dnAWTbncc+Hn3epR9up+zcMFsmzSxF0bExoW40kuLHRA0Muz2bhAllHHkvNGQlpxCuOJsGY4yj6dnG+2JG9/1KM31oMrJMAHh8F3tKZ+NvM2aGJSBxFoHQKe21P071tOr2VeXzy69bk1pCIzYnxhSPRO3i99C4ONmAD1eu8tmAHIQglifGM6v6HvwbODiphc6JL8kKFzmmUW6rtuD8sWaXEjwXYbMh7mhE3 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6af4037c-e630-4e2d-386d-08dbabd11714 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2023 16:24:32.9716 (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: DU2P250MB0272 Subject: [FFmpeg-devel] [PATCH 3/7] avformat/mux: Only write HEADER marker if format has .write_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: l6ZpnoeU1NF0 Signed-off-by: Andreas Rheinhardt --- libavformat/mux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index fff8094341..0cf9ebfc19 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -464,9 +464,9 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options) if ((ret = avformat_init_output(s, options)) < 0) return ret; - if (!(s->oformat->flags & AVFMT_NOFILE) && s->pb) - avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_HEADER); if (ffofmt(s->oformat)->write_header) { + if (!(s->oformat->flags & AVFMT_NOFILE) && s->pb) + avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_HEADER); ret = ffofmt(s->oformat)->write_header(s); if (ret >= 0 && s->pb && s->pb->error < 0) ret = s->pb->error;