From patchwork Thu Sep 23 15:28:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30501 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp568026iob; Thu, 23 Sep 2021 08:32:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxf+fg04OMFNe24tOr7ApNrV7BUuy22F8ZyFXsWAvFUkWOKekcNkrgreEfFqxWvA6USCpGc X-Received: by 2002:a50:e005:: with SMTP id e5mr6118764edl.211.1632411121524; Thu, 23 Sep 2021 08:32:01 -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 6si225174ejl.543.2021.09.23.08.32.01; Thu, 23 Sep 2021 08:32:01 -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=UaoEj47D; 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 0AD3168AE3E; Thu, 23 Sep 2021 18:29:46 +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-oln040092065030.outbound.protection.outlook.com [40.92.65.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 417BB68ADE5 for ; Thu, 23 Sep 2021 18:29:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k0OvW/rkOpEX4K47mQpT0t/3MI8Ir9H3lTCRRU8/coDXmB7MYC7DlDUGKlmxresOON8zkr1BG6vjkuhJrphCm+pOxqmfmHW+bcBv0ouyefBgfI+yL4OPWCv/CSsJjjZtx52vqBkFwi1NYlMDvpU/qZ0qOdm1NTXKjVv8vdZjxExhz9RRP26pXb1OLVjWWWPx1zCsOYOOTe+OYxUatldEkuTKbwtrbrqRVJ47O5rY29em+rmk2ZS+xrVC/7snCKTi+QQJ9zH1A9UOqtqlHTe/bfW7fS6fF5G/mKude85rnFI6JWFD2/wlYudtSRV4FGMePZmk8hroYscK0DBhfrSgVQ== 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=5ENcrwqGl9tuQuJoWZkiP/l3qZ7ZORjAOmnG1/lv6vo=; b=YJPyRccZH4QCRjcOIOzju4aMOrUdoHRgjcPJe8y7+Y4BORhWFNlujI6aoSaTuxZVU0eroLcA8YfUZ/dVuAVfcoux5lrx0WrHqenBW6xPQplufDomLvmslCX+r6wS1IpekfC5mBl7n6pxi6k/IyqoTsEN8yltgJcY6lCMIIfXKq84tPNVNhHtMZ9qqxZdu4c8OPaE7iefmH6sLKRYwFzMsjne68K1aL6YpZFMxdhdNGVAoOlqKjO4ix4HlSW4V7t3Wng0w0XmE+7kreonE4K+YJH1ML6AGIpczJa2F0wLtYtxvIlodOvHThKbXc3Dt4zoGYwYkQj26HuXOyhtA8M+TQ== 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=5ENcrwqGl9tuQuJoWZkiP/l3qZ7ZORjAOmnG1/lv6vo=; b=UaoEj47DeLpDDTXD+OLMUcr4OJNRzuvfcqe0Qgkg/RrBQcx9XoOQoL3gx6REzU1S+T4OvgEs/InR/FBZr/8eZnzgdjh5JzjtpFpuHtlw2Knk1IAzQtsOlqd7423u3j3a1hFaezi9pV8RbWX6ziTCzEAzXNSWx/J4KxyNb4yQLAw5j7GPvW3N3LEBK66mLRd/vCecC3DPGKL0cI8NkTKTWnOJShDsLs25NchMNmeEBV/gh6dvNOklNZnXUF3EwkC7tVj/RCRSrZtsfH4ok68GUzuu4EM+X0cCXmuMeM/TEpYcesePrTBPv3u1yyLzmPaIZKoeq6bYa8h0uMs0qO85Kw== 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:41 +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:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Sep 2021 17:28:50 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [1q0md++R2SoiYagiUcoMZ0isGLAD1X0J] 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-14-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:41 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a09f72a2-8eb5-4c60-d540-08d97ea6f670 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSygBPrM25OmITrtIHMJgdShDAvsNw1gANLjLrLtccPy56kmdjOcR3S28N9bb5y9erYFb1SiZcRrvEmJZHkoayoMhvPBp5IbOItUSIGb/ry6Vd/oYySZGOr3cKTM9kwh1unOoLO+ESYsJujqehYD9vuTnPYCnjL4CkOuQG0dGkSDOS+r/Y03iLVOlIEy1CO/54gOunk7mtmw0/n4m2fDsL5CLRxxtcUo2MVessm7WBuBMd2FFyRH12XztZW/DCw3IErnBeYhkEsOKQ5WCILeiiYY3VMZtOxx15SspU2i+2XOVkXafAnT/0diooq76o9nC0FRMbHkO5bTfm6Eus8aWmkLpBgdlYNWuE0rskNlUxDUjJ8cnwwQgOe59QVgZq96adsT64DD14kidnCyj45EnQreuSd4RzV2g9xCKYRp1f2YVgCPwg24ZsDBd8nJr4o8WxgDCUvKFS8fv45bUf12tTPRkl175SRrRo3qm3d8xwAmwuj+4TC8TFXtM0kNXuv3LMWbysGHw6bnckBH2dOl0VznpVyPIIK5B31biv1b7UijuQFuq0780nGywaTKXCycWWH8DK1RAA/P3EbzknvA+NllwkSTpSv2E7rPjI/zeBxlJRqE5IxZY2jqD2Nfrc878mX+e1N6jROUyh4sFIwgCU4MzUtNovXRg9tbsJy/uxzqSX/rLXHpxqRlyrRfmt4U6K+B1tDUhwRQlm5ruOn+YEoTZzV8NHLGW5cAuXB1U7q0sc7sg+x8gQbsx4Ya2pD9Z0= X-MS-TrafficTypeDiagnostic: AS8PR03MB7061: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3TqLzClHyMGCc6rceSSxVWhwYJlG8AgAlGfP8mvR6KYiMm2mgrCZ96noXZOwuEpKI8FdkHLh/EME83XHRNQ4CZdWYgiGW1YFdMGjOu5+zwUpNmETksJlLNdeDXjmqgYe4+ObSVmIxPwCg0P/m9cZQxQ1jbwickbvvMk7WKnRqOpjr70m9/ySC97DOVGmYe84St6zg5B9ncZaLaHBBahI22CMbE1dZoMMOtwSvjM3pcLxgXDUPaSI+ttsi8lI53Sx38ewWg5EXilij2hUBshY4NrX5DEs8yYRkBiJhuJxXyGlu9+EhjvloSs0caejdM/W84P89rorPBB+YywUX6l5EPuvf8x4f5oxOB5reMZgQK74kX79/GPbPNCBMISLehDeb3xDJW6GoSIszlNgMNZiDLIUsbCgJl4AplvgXHW8Du+gkpe5oluZM14wNgnmXFCJ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rfa0mOtjdYmgeKkCw8uvdzRHRACij4Park75Jr1NprcqDuwQDC/JohJ6XpNarf16JXrFjs5oNV7hbbwkDC/B9Ur3G9zXBZRwJ9xKtSUweXJRxhmjv9bVDEx8iJs9cuqWIwkRRLRQ0CpbvGnzHAg5hg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a09f72a2-8eb5-4c60-d540-08d97ea6f670 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:41.5609 (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 15/27] avformat/matroskaenc: Simplify writing qt-compatibility 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: l0IWoGmb9cvO Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 039f20988a..f17665b0c1 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -785,11 +785,9 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, if ( ff_codec_get_id(ff_codec_movvideo_tags, par->codec_tag) == par->codec_id && (!par->extradata_size || ff_codec_get_id(ff_codec_movvideo_tags, AV_RL32(par->extradata + 4)) != par->codec_id) ) { - int i; avio_wb32(dyn_cp, 0x5a + par->extradata_size); avio_wl32(dyn_cp, par->codec_tag); - for(i = 0; i < 0x5a - 8; i++) - avio_w8(dyn_cp, 0); + ffio_fill(dyn_cp, 0, 0x5a - 8); } avio_write(dyn_cp, par->extradata, par->extradata_size); } else {