From patchwork Thu Apr 15 20:16:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26943 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 33F0E44ACE3 for ; Thu, 15 Apr 2021 23:17:48 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1F75368A711; Thu, 15 Apr 2021 23:17:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-VI1-obe.outbound.protection.outlook.com (mail-vi1eur06olkn2058.outbound.protection.outlook.com [40.92.17.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44EB268A6F9 for ; Thu, 15 Apr 2021 23:17:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WbP1lOu85Dlg2sYgXBcsp12GJlYl4TEXpVJy1u9obaYv72tsqPCffjQwCLWEkJQ1cgcYGl/1N3FRFimBRZ3fbrvTwUPeXYaNoV5Iwv4PiG/73jJ/QHm49LxQRrBOytNjDE5iIfbtRGRxtxNWMFVnRAnQT0MSKtUCCQnfBeHDKBpvhBB6gxsb3FB0/EAfVRonG/odbufVuwkxQ9DxeyYNQzAbZedIFL0gI6EWOf1zHaRfLWDT17WubjGuJ14NlvF2tHz16rtJDgsggby1HRPJ2XlUnGA2XNBpfVMMehVXdHuBKFOFXR2UHcQRkcbDnRfNna59C5KBU3/gg2NCT+QWeQ== 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=q2pQ4Qh2tBKbcvcbfx65IJsDCR1O0v3cdjgPx0YgS0A=; b=lmTXUT+aSXkqSFLSUB/imvLIbZqKRMvbiFDlc2CClGBp+0NgIDPIeoTY1ieiIuM8nROX939OB6jCvIVDp4f9F8pFLdD1vwE7P/Dwe7IRBbg2xXyJmcdgCpBtbEiwVuTdrHo7ho5Ekfu4cEJNcezMaTVf28PAleYgPYPBgvKSNu/5NM+DHDWB9+6AjiG3se5E4fVMHZZ0OwOgLOeJ+GOWhBawQQoF/HBuW4BOGSJb0guR0pUxrlpa12czjyDeTj0828/aT97inMDdF/LntyNMTIY6ytR/gx4WrGctMyBhAhJBJ2TD07lPJlA9g4AP60sMKHbzz5yQLTkwBvJvSMwAIA== 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=q2pQ4Qh2tBKbcvcbfx65IJsDCR1O0v3cdjgPx0YgS0A=; b=R+h37FJ/cYV4z1UjL3vkSQMBvlRzYq8EMyrRpqtF/wapBym+uY1bdc81pLjlxSI35XMw78T/p3bwLvmW2oaKPPc1xa3j7cPecDoaQWm/fNixUkOBTLh+n02SjX4q6tKDtc40SocKYUwK2j8dBebOoWJ+T4DmyAX7q/g2gnSXRDXU4XmpDVWSiChgaXDxGq19xEnO2ws6HsJREvYJaLQS7F6TdZpZ3NSSd6SPCSgGDuy7Fn7W+/G4efDVa2uyfcYUuTzH/yrMc3LVY01r+yAKuoDk9pCiisL02DSbBzY46gU2/ALsx58yNQYGp7rlKmE1PLGphadnvS3ipx7cJgX6XA== Received: from AM7EUR06FT022.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc36::51) by AM7EUR06HT020.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc36::163) 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:43 +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:43 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:3244C3771416BC309DB86D176EBBB205D6988D318EEEF20F833A47C5E981085D; UpperCasedChecksum:4C05E72937D95BCC21C70D4CDDABB68A7F46CC057B2BBE3032AB49EAA91A856E; SizeAsReceived:7589; 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:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Apr 2021 22:16:59 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [r8/9bgPIjqaZXanxnGjwvXPz8amArjCO] 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-9-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: 7de021a4-8acb-43f9-498a-08d9004b86b3 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXFKoSKZyiLYcPwGDHzH9eVYJG0LjAkS2O8jd4kIGEwb66NVdLzSjqqMVPHxhfuzBXhAxVj7UFtjPlUyTT0+s4OgbxVt1V1MHfx2ayWs0GdPuQuo1qAXtS4l7JjaWlieXPhxKGgB9v0sLB93Pg4GKGDXKAtOHkrRyfKQeuLAQCGX11EB0QQGjk49LU8PPEBaE50urXlO7iSprW+xuBDHt3+9e5xOYKEcwkDiPoDkLeYg8/w2bl0Nva8SYcA2aIRgjdC6iNcnNe1Zodh9tQ7rR9Id9kLyNZuijTOPejm3ynOo2MRY94Xp5DaqLSzaD4GIxbMPgnqI98hN6e+kUdGvBLC1hY5Ku2jjcpTTKK98qOzkm/GMCffg9GCG1uz/PxyeitxP94BCS5YB8bOrtVwZdfCR7I1rL1tAHdfGBOfeyfyJHov+FN2kDTnHPjAvUnarDnxxyijb4gXhmGJVPKobBn5PpeqG0D3RSvi5uU2cdLqu0EN9Qhj58UaR7VY4kLHQEpebbP4brMJzQ0b2urybDdVnxQq7QRy/HJvoaU84D/LW2VVJq9DZJrfoEcfZ/BF0gP2h7D3i+xbBlknKpbO0ZLlXZha1kTfhTPY723ILhFJlgL+xQO+7oJDfZ+0K/DNZOTFP6niLZypnL9BRQMH0lHS1/XL9zCkrP4RO46us+NKnRzaXC7n5eMrxlHmNG4WtLZWSSU3NBAeMEJjXFN1pemT85wDP1gCV90= X-MS-TrafficTypeDiagnostic: AM7EUR06HT020: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6Brp200I1JlVO9ySnG3g5OsXD/MBeYR8Aeyetqqufm1RfYqIUoBjNLH/V2dz5dmEa25IfcpTnogd95Kb1k2OKPmgzGOFb4HCG0x19fOnNs03glHC7xoTOxIudu2J6hkKF154O3b7N2gluoJ536NY0lyS2VwEoBocLcLuy+zlqtNkfLR3ajfxar0//Wa8lcxcDY8WSiv/OP77ZFKWn8Mq9TSV3p41v5BJXV6+SdzNxQ7Ur7uR9mJkVNXjNiGvctnbQybZFv6FrzPIZcJbQwZTuh7gYlpjgwWIT7e4xwIaQo+0dp1K0if5qbu/kCJSZr2OZUi4IwWU8hM7rCH0owbUJgBFvl/pihL1o8DLwY43bEkahnuB1BDdd2pPLPyJatRv4c3GcjF5e2d8ANStdO0KLA== X-MS-Exchange-AntiSpam-MessageData: 6j14gT8mE4mAfjaEe+L4ca3btOpbj7KNsIeL9X+T+g3a6ZPJHAAq9NSBO3Q1UmnKWSgmW/LurwOFw3EJu7obkTQ8A8xkS1B/G/GdKqokLxD/LPjKCRHPC1Y8M/er223k3pRFF67a6l2/3ERLbXqEQA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7de021a4-8acb-43f9-498a-08d9004b86b3 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2021 20:17:43.3938 (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: AM7EUR06HT020 Subject: [FFmpeg-devel] [PATCH 10/10] avformat/segment: 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 id). Signed-off-by: Andreas Rheinhardt --- I wonder whether we should use ff_stream_encode_params_copy() in the other muxers with submuxers, too. libavformat/segment.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavformat/segment.c b/libavformat/segment.c index 5265ecaebb..cd72e8b701 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -167,8 +167,10 @@ static int segment_mux_init(AVFormatContext *s) if (!(st = avformat_new_stream(oc, NULL))) return AVERROR(ENOMEM); + ret = ff_stream_encode_params_copy(st, ist); + if (ret < 0) + return ret; opar = st->codecpar; - avcodec_parameters_copy(opar, ipar); if (!oc->oformat->codec_tag || av_codec_get_id (oc->oformat->codec_tag, ipar->codec_tag) == opar->codec_id || av_codec_get_tag(oc->oformat->codec_tag, ipar->codec_id) <= 0) { @@ -176,17 +178,12 @@ static int segment_mux_init(AVFormatContext *s) } else { opar->codec_tag = 0; } - st->sample_aspect_ratio = ist->sample_aspect_ratio; - st->time_base = ist->time_base; - st->avg_frame_rate = ist->avg_frame_rate; - st->disposition = ist->disposition; #if FF_API_LAVF_AVCTX FF_DISABLE_DEPRECATION_WARNINGS if (ipar->codec_tag == MKTAG('t','m','c','d')) st->codec->time_base = ist->codec->time_base; FF_ENABLE_DEPRECATION_WARNINGS #endif - av_dict_copy(&st->metadata, ist->metadata, 0); } return 0;