From patchwork Thu Apr 15 20:16:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26942 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id BBDEB44ACE3 for ; Thu, 15 Apr 2021 23:17:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A225668A7E0; Thu, 15 Apr 2021 23:17:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-DB8-obe.outbound.protection.outlook.com (mail-db8eur06olkn2031.outbound.protection.outlook.com [40.92.51.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C610D68A773 for ; Thu, 15 Apr 2021 23:17:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rs+v41/QZJF3HN7OAYskwJPg8/R92DKuFXmH3o5RA2JuTgVnh2HNBGoEMRV/8vnxZoYmTIBDW8j+lH3wUYkIhjyUcnWKHUtNl4XjEmFBx0F/OdlO1i3L7Wt8eDv9DObG/utsnbIDGAvsMXEfokATXKsElwfbb6mAx/We1T+R2Ivy4BqbJqEeqDlJDUs0818qO+ZNvWwnVIxAf5/Fj2Yf2uDxpBBPqalsMIdHBsz5Ubs0TIUQE0xhJNbZyPV19ERRU+gGm9ovWAF+f4ZsS19B8olB5svt4rSDqSszsGZOq9SBFYnnUJm2hr91yazLKMDsA5MO+RsL8ucEtFQzPfJx0g== 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-SenderADCheck; bh=oKvRcc+6sBl/q9ha2UnpmPXjlXN9zj631eyLwi0IhTk=; b=Weyk37uhJ+2uWm5f9w4KQDGjvl+cf9rjF9ENJNeDqiMW9pJMZUIQJ42WJfkGaYGHHiCgZyknR6hWF7oRntaMvgISXT9mrb48qboX4AOlGdPPYB49BvJWALdDycwYKdDEji38NkEliINpHKRfRwWQl8RpAY2nlwhlIlOjN08qrovqBn1Bt9g/wFBKRjAM+SnPbH4pPOJIR7SPgdId35oksoMQQnzjjGmSLsAbppfyK37tBwzD9Jj1CrRf3/mM/dOAm4Z52ovx37rgP63XFlL/uxk7Hq54iXqo0+4/T+NqLhh87uvvfD13cNzphnf0GVCQ5pjp0aQItcFh2X6UoChguw== 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=oKvRcc+6sBl/q9ha2UnpmPXjlXN9zj631eyLwi0IhTk=; b=mltUW4KiEhGUVod5Lm9IE/php4GEjFrpPDnseiBKDHwkSQbE5fQDOv0iDD9JVnVnNb1ko0qfgZKGanTiPlMnU765UWqabH64BAoHC7W2h8CPc4YjVoekCyYBY/sRxc8czXT6oTR50Cu09vwVk+lq5OAqKfTDa9uSxW+5z3um2mhQarNssmO5AUok2iQnO7duJso2AqqHauu0mF1MA0EdelaIosKyo2JPKoKYbU/v/xXeez44wsakMyMJ3ivXOe3fOm+hBAj/0x6i6gNJbkotzxwTUHQHt34IC/PJutnvulnLAQSO+BXn2R+lWNYFMrhQQF8wWI2Q66VsQ+g7j85BNg== Received: from AM7EUR06FT022.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc36::40) by AM7EUR06HT018.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc36::414) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16; Thu, 15 Apr 2021 20:17:42 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc36::53) by AM7EUR06FT022.mail.protection.outlook.com (2a01:111:e400:fc36::388) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Thu, 15 Apr 2021 20:17:42 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:4227A2065576E56A8B50634205875C7E7206C250D52E0ED50D53B2CF341B9DC5; UpperCasedChecksum:051D095C69B732D4258729DF4E0DC57AC0BB36957E857347325DE45C04756853; SizeAsReceived:7592; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4042.018; Thu, 15 Apr 2021 20:17:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Apr 2021 22:16:58 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [5PN6a7+QkvGwjSoljC/FpQHy8vRCZLrR] X-ClientProxiedBy: AM4PR0501CA0060.eurprd05.prod.outlook.com (2603:10a6:200:68::28) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210415201659.1810798-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM4PR0501CA0060.eurprd05.prod.outlook.com (2603:10a6:200:68::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.18 via Frontend Transport; Thu, 15 Apr 2021 20:17:42 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 281d95f8-72bc-48ad-f64f-08d9004b8653 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTvkErHHM9AELLsJR433rIZOc1NncvWd99ScvJLKDWajt/3oajtMv9cuiGse53baST9Nu1WIajeQUtsfoEUAmWfntVcpGcxGjglE2QoE/qjXT71ldANCeT0oLely5n3AMHdouQXqUzQVQhZCmAJ1LD/YB7BFTkRTAK9G8lfmg2Pas+Vd0Ee/nhnbV539NJ4mLOSz8VqBNiiATe9r/chMj1dTWwJ6F219gJFI7bs5VUGgAi2iPhUtVY/Bb2nEVKRX4v3nPYZzuHjzYZNmrazaVTh6yvpVyDwRwPZku9fE4RpLHgchyPyXMwq7VSeFpu0UbVCM3h6JqC5WzGR81qEeHY7RmBkR6VUKcpgJ3VKQUfwi8lL6GxbD7PGCtsppySsdIjbHGD79vcN5D7XrfQZiab14ddLLS70Z6QZhw/RZCEV5QtRUpFbP/fTyEGW2M4GZfe2xMbNWicUvbGzgm0ArbsvG25T0TiWbTWpP+TskdwyFQBlFe3CxYdOYnr/ie/5t2o0AWORfIDx0tV2lLy7X4THeQKrvdhfPBn/8xnr0054tq+ehY90KmmFjtGKcg0HEqdzyQvoKWJd0mNDTzqYZ0YNqxoEKqGEumyjUBBsH4MPiPbpgqjK6EBOUf829kvasXdGzwEQ8DN2fxSlf6U4ovZMeaMVa8bXNEuMxyPbF5i2na3e4jq+XwFU9uGyeiaJGjXi+fbVCdcJlLLwWJjCHIe2Ty/3fL3i1ro11ClI5ya55zW+4iGVyJwqwKthrZbF/QA= X-MS-TrafficTypeDiagnostic: AM7EUR06HT018: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HNz5FVX/cEAduavi1dVjO4zPpuBvF+chT7zPnBfBpEiAITTwXssOcTY7e3X4YxYj952COQAIoT0KNJp4Vds37fCa888yNNcodIl34clZUnBvH4cXiZZDIcD/vM+2iu/O3UyYmxqrjDdqrs21Mu6suvWzmdHA0xu1fc3gKPwGj1XBNRQX+0SfbD9HdVIsLa8tnTTaR/EYNt1GObhtkUO7sPLwoCoxmtnhF0IFyPKS9OLdxS73hsgA8DoTm+egVqICTgNCubxdsfrrDMaKTyBTFwIEIhAqAlyjv9cchZAQaejYYo1PwXUjRQ7fXGmYjfcM8C08HdYTAXsya1/dB5frDyzTBoUQrc9gieuyIETnieOja5XH5YAH1gA6lCClNq80GeXXIdhPT8OGb8EqEUDc8g== X-MS-Exchange-AntiSpam-MessageData: gc0tOGZgW8jq8ZejbsPyOP1F9ipWwOCRLiMLAHqUsnGE0N+p5i7o40pMny+msgHzeVFMb+I/U8QPXc1y64HdCrV+cu+e2ti1aWKb3t8DDSh7E8vNBIBrjZZD4Uto8TmnnR+WSLTdLpeBakGUGKtEfg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 281d95f8-72bc-48ad-f64f-08d9004b8653 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2021 20:17:42.7911 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: AM7EUR06FT022.eop-eur06.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7EUR06HT018 Subject: [FFmpeg-devel] [PATCH 09/10] avformat/webm_chunk: Use ff_stream_encode_params_copy() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" It is simpler and more complete (e.g. it copies the framerate information which allows to write the default duration element). Signed-off-by: Andreas Rheinhardt --- libavformat/webm_chunk.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c index f1bee5fa9f..fb5b20a8cc 100644 --- a/libavformat/webm_chunk.c +++ b/libavformat/webm_chunk.c @@ -93,15 +93,9 @@ static int webm_chunk_init(AVFormatContext *s) if (!(st = avformat_new_stream(oc, NULL))) return AVERROR(ENOMEM); - if ((ret = avcodec_parameters_copy(st->codecpar, ost->codecpar)) < 0 || - (ret = av_dict_copy(&st->metadata, ost->metadata, 0)) < 0) + if ((ret = ff_stream_encode_params_copy(st, ost)) < 0) return ret; - st->sample_aspect_ratio = ost->sample_aspect_ratio; - st->disposition = ost->disposition; - avpriv_set_pts_info(st, ost->pts_wrap_bits, ost->time_base.num, - ost->time_base.den); - if (wc->http_method) if ((ret = av_dict_set(&dict, "method", wc->http_method, 0)) < 0) return ret;