From patchwork Thu Sep 23 15:28:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30484 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp565767iob; Thu, 23 Sep 2021 08:29:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYQ25pXepUfZ6Qj/U4St1j6+CBMwAkMIpdfpcrbT2lNGdqnyq0mBTd20aT5t3d9wipWKOj X-Received: by 2002:a17:906:942:: with SMTP id j2mr5848435ejd.303.1632410984948; Thu, 23 Sep 2021 08:29:44 -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 m15si6271282edp.413.2021.09.23.08.29.44; Thu, 23 Sep 2021 08:29:44 -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=ngjjEkto; 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 1150768A920; Thu, 23 Sep 2021 18:29:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065047.outbound.protection.outlook.com [40.92.65.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E360468A920 for ; Thu, 23 Sep 2021 18:29:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=STNBEyu/OiardOjkOUTf20e1Wbm+sCAWScaqfFcEz1kONbr/IQIcV2irkj9K5P053Ld/8XoQ2UJ0q7EVFH+frklV4pMLWQsm0sbcZ4ZN+qAUbpgCVpC1wVBY/r934zqgzWA7CrLJUy04+f9+AyQ8tLMee+qUEnQpNU3i0AsnyS8wVVTwn5SejIm5dmYBZgh/YmuSkep5C3/1uMAPudkccWCZva1K94ggoRS0vfjE9cw221cJpjOs+UJ/zXbhiGjHhuPUvfBpFtmcaKvyICKc49qcYQkG50MBy19b63PhCwsBmeaE8kNImbX1mEFcGCBRgMEaWSXNMCM6T3ZIsZH6+Q== 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=//2+xNSHTQDOehc0ZV8MKRzz/ipvPjkrUsEQiOLdk8o=; b=jDukx4+zTjtIJgsApT3Hecy9fxOA7VP9qvllWuYeXcAzmt4XvYW07GCpCKI3Bu04++LSvf1ZAurfNDItKnFrKkKWcGGikDYy8rpmzK6P9MCLjsF6V5GrAsfrTkdDW73XCEOvx6yEZByRDnkKqNYSmU2qPZccvHe4WsC85OHatq28unQE0jjPfTybFaArGJHRBRIWlzKWezTIIKsJeVsTFbCL4O4l7SeQ0jbz6b5Icl3ANC+bMquDk4wJKN967yp7zvRuLeErabjeMuR6Klsj7HBZbzrU77tt+WvUQY1UncmdpABuWCtDlqa3xUXwyouMJUyoyudTDqP1vs/mgBxuxw== 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=//2+xNSHTQDOehc0ZV8MKRzz/ipvPjkrUsEQiOLdk8o=; b=ngjjEktoaJsHVOfwy6Q4ksXFwvji5+c673LcJzLnGgjxwuJf/UDFpzXUCD4A4/hdKcBZzlpPv9/dWxC4LYZlwNFILOA/UtzrF5akNqB/k5R97LJ9yDX+hNRjmcA2mUGRPdhzerqJE5YNMkYeAO7DUvSwwaKNjSVdcUk3oIWRCHTBTRgez5ImTDOtm6BELHTkY31RB9MHzhd+fXqtqXIGfYx61dn6TIrmpmkedMra//4LC/VgXdD3ojFCOul0XH2O+CMb1SVBXLWyC8F2W2msi/Eh8VI1gWtZ4RJpO4oxzxvymkDE9xP0sAXcoOF8l05qKza1aiurMOrKE+z/p2+inw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7061.eurprd03.prod.outlook.com (2603:10a6:20b:295::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 23 Sep 2021 15:29:18 +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.4523.021; Thu, 23 Sep 2021 15:29:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Sep 2021 17:28:39 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [xsoBkUPfJe+q/OxiHJJK1WT5/e49x9CY] X-ClientProxiedBy: AM0PR06CA0106.eurprd06.prod.outlook.com (2603:10a6:208:fa::47) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210923152902.42865-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR06CA0106.eurprd06.prod.outlook.com (2603:10a6:208:fa::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Thu, 23 Sep 2021 15:29:17 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4cdb25f3-390c-481d-fb61-08d97ea6e862 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSygBPrM25OmITrtIHMJgdSt6lCu5VWoqEQVrP+7ApeAjAOALlIxb/5MRouUQAzEEfF78t0j/ScJP1CV6kCCTaGJMqsc0lWwU/SyzWOineR/aLlwW7XA0CQ/IJaJ76eGPyPxxZzHtT5xq55+zBKNwOrJNsyOHzUIrKDOgMIDmPG/60TUYrFL/tRCKsZBEm510doFyFSmv8V2fLcUfxb+P9ss7oxn18wusWcKU43AM5T0nknLuZNuUt/5Bey9tPTitpXs/TYbIW5ssS6LrAa6qC2UBrgfr5kNw1e2+0EsXc1HVAjYlMymI2n8T5Gu3yOW1B8ftHqTArHCqo5uTQRZvgoiUJeWPCOLo/SuufMTwkzHdNOEOC5c1R0Z/bfnBSASpjlvuZtA4iWQkq3DRs0tBeAUoXetzPoB1PR4nJuM4S450fi+MJZbbCmnz+wEGXnnb61uRShaa4wjvBZdkOdBoc98y7zqHsstlOmySV7XhqArSdsqbfMFQ3lpdU/k2LDncXmlxFzDXxk9WcGvw50EQ/QzZORKEPNa753SQkav3UP/EzT2SOAP4v4MrJi55DOpsXgaDjXssOUziGcLkDhU7UItgWv4boQF7PK8Pn0Iuprw/VU0SuQlzNgs3k0Je7SOARR1MVCNmYZSUJcQySscFFoYYylOmM+qjo+ryqzPJunwhfqAzTOPo+Fc6fO1CaQIC1W7EWAYPM+0mLm8xBaM8aFSilj+7Etvf6h9D7WlQGLyUc/Drzg4B/0415jWSQM6VU= X-MS-TrafficTypeDiagnostic: AS8PR03MB7061: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6ESuOiRAtW6dvKn2smLH2jbgimkzLio4HxOGfekDVCc7toQpcXfsXR5RU59LPNJZ/2YcrD/iG4Ai9lh0e8wyIrC30hnAe7mp5VF/DdlvUcbZ9jA3BwJwTg2wgirdZL4XCKg0jefQ97kU9vHdbcX0UtfPhwul/I7177nalnBHiEY6izA/CIB2aQa0tLK6YVbz1sL/O9A4pdWU+yPt0O8xWgG2oGFYRN84tDCRQaaeYx9V85Ad1VGHz+Na73lWuoAz8Ip4HQMjBNE71SjVWXrpIpveI3tY4z2UVhGGS+ubYx3Gswu3Z9vM/N8u+6+awMSHaOeKeoXiPWYeFMA3A/SeQwolCmZ9hINnyAdIwWqW1JakrCbsFPTQnqBoOitTZVOzkETBAx9Bm/u8YglWLzCiAh1xXi5VnRewk6FIOZx6RlhSbjuEwfYl6MLjAS/dCTFd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IVNvVZf0QD48kEzfrUU2sibPZdZ648fmLfHzGwcTZgN4k0nK6mqTOl1jC2/S6PSoAw+Wsvk23X514BDuXEU67dQ/XBVQIqzIXDSp7vIedMfsFAKU010HPuukqJ+GyoXAPB+gaXAvdQB9BTbK0Z7HMw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4cdb25f3-390c-481d-fb61-08d97ea6e862 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2021 15:29:17.9999 (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: AS8PR03MB7061 Subject: [FFmpeg-devel] [PATCH 04/27] avformat/filmstripenc: Simplify writing reserved elements 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: Z1V1b5z1Jv2I Signed-off-by: Andreas Rheinhardt --- libavformat/filmstripenc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/filmstripenc.c b/libavformat/filmstripenc.c index 48f483bc90..ebb7294175 100644 --- a/libavformat/filmstripenc.c +++ b/libavformat/filmstripenc.c @@ -26,6 +26,7 @@ #include "libavutil/intreadwrite.h" #include "avformat.h" +#include "avio_internal.h" #include "rawenc.h" #define RAND_TAG MKBETAG('R','a','n','d') @@ -43,7 +44,6 @@ static int write_trailer(AVFormatContext *s) { AVIOContext *pb = s->pb; AVStream *st = s->streams[0]; - int i; avio_wb32(pb, RAND_TAG); avio_wb32(pb, st->nb_frames); @@ -54,8 +54,7 @@ static int write_trailer(AVFormatContext *s) avio_wb16(pb, 0); // leading // TODO: should be avg_frame_rate avio_wb16(pb, st->time_base.den / st->time_base.num); - for (i = 0; i < 16; i++) - avio_w8(pb, 0x00); // reserved + ffio_fill(pb, 0x00, 16); // reserved return 0; }