From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 253F548BA2 for ; Tue, 6 Feb 2024 08:55:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7114568D081; Tue, 6 Feb 2024 10:55:36 +0200 (EET) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2101.outbound.protection.outlook.com [40.92.49.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D1FB868C58B for ; Tue, 6 Feb 2024 10:55:29 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aVO8mSH1uQaSd8klQdQtCo2ZVWs8aXofMqIlDrSD6eoz97UgpMbyS5AklANKai+kl9yvCh75I9XrFKd7Y90z2D/9Fklua81OJYTD9TE0fHkYqOIfaox9OkKyO+q6C32iiGpAfwsOwwUtLRHY0q4qJrFkcd7e4n0TJ7blgHvpGFRqvlFo25np1Op8fXa6DfCEJd3/Fiz3dcc9WWo+7Q8A8ZtZ3Bf5PXhJ/bqWN03Z7nF6Bcb0wmnslH2uZXAak5tHa3J3ou4ggGhLxQg/T9rTm/CNyULregBbTwkvVzmXcCkvp+irvp6j4xpz52BF6Fe7n8+II7CQUGaBg7rMaRPpSw== 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=iytXTGVH3+ks2lohAolm3B88aIn4GZ4ZL310ptcUOJU=; b=Qp/wQyBonpVP+sA4TtFgEZZ4aG9L9eRmN12bEIzNS+Vkfe5Xm+zeQCAJuPlp8zU84qPRM49yigY/T5840ZFu4rbOJi4D28Dkwt+6ECYBTySStngnlpuuKJsu5kMs55L0rFz90ugAZvjXez39xa4RUuabFfsDjesnDLSVu1o29laH7d17YOI/n7HhAXQIeVrUHYzLmS98HRtc0aEnezq9mJfDU2BvZ/O+UImXjAvkbz8qwdYZyP81fxJE6AjDD+IfIAR9gpmStw0zIo7quHC+lqhrZhbe/WkttFEO5zYYmoB/2mwjPbBfRz+gviz21HzmXjHXLYlCajC7kpG5Nz1y9Q== 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=iytXTGVH3+ks2lohAolm3B88aIn4GZ4ZL310ptcUOJU=; b=JcIoIdnpirGX9yfCcWweivXTiIUWFGKys7CguToB9hBSm2Ds/kK4fqWETmmrhuhxoKYXp/rPAHSYkUMfLCVPRAG7NfdpWtWJzHgAmB73FzCHALJa5D0wOuD3RdWIcrRhMUSUVHGMxtGZlJTUSdMYBF/WbwPvWkCrJjYnPJaedL3y/d2P4OJCvI4Hr1MQJDlU2w5iiJ3qC4VfplXewmnppa0KObEr3iT3YVJB1tHySPlwpGtgR6noK8vUNamh/7OKXFAHHJIm6bXirR7g7F6qvJHcNw0meo3Ag3z+g0EJ7mFtfFi62MclunK/x0a5lYG/wi5frkSVr7wEZjB26S5UyQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0209.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:178::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Tue, 6 Feb 2024 08:55:26 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7249.032; Tue, 6 Feb 2024 08:55:24 +0000 Message-ID: Date: Tue, 6 Feb 2024 09:57:18 +0100 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [q+ct9az/5x1pE1D2X3WRS3z7OCA+6dLyZlAHx3T43N8=] X-ClientProxiedBy: ZR0P278CA0034.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <5a520918-fd1b-4371-9ba9-aeaa3cc3354b@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0209:EE_ X-MS-Office365-Filtering-Correlation-Id: e6292d25-987d-4fcc-c98c-08dc26f15b87 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqmcPDF1KAd/mmqN5uWR7ypvF9a7pfdKWyLfdk9zHdNcV8MU/OwOV6kPV8HzZDTA/S5IdG5qNFD0QDm5J44pCmpPDC0yXOOzb5/BauGeW7thODupF+bps3NexpcSwHqjaUJmHnDTLqI9LhI77dwyt73khBHnfy5z2PhxJcFsEkAx9adetd4pH5+CMlZDci2hf0vTFYZUwt3KYSZ/SlhVhqXGLbvMq9c06a+4gcJMpmhlKkAIsGShG9lzryoTOotICcIvelRynWiWYPblSGxnZifLeG1RPX+m7ivV6fMDseGdD5zndc093IYcHodwKqC7YNx7AMBgWiy4QGljFb52YkOInkQExaXX5KEX4t9ft74/wqP+BAEHqmtK+P6KyiIFH7EP6NDiLEiPj1FiWu3tkX/Zj8sjUsiyM7ivE+0SEhvo5VnUkEtp5M3aqqLrvPEXZc3BHAieJ4F0k3oqIRhkfoNWSJ7cADdS8Sh1+S0HdFYaKoRVx98w8CTBtdczVu3SzedyvlppKQYzp5mxxh+PpSzb6IpcCMkIY6gXLtQtPS0Fc5OYeJLZXI1G4rEIdnXT6z8O7wVhPmeTqRZc1434IGpFpqUwblRIPO0mOJ4na+Rq2OK64+NgY9CbWfctBKbjHYe6eh4xDQ/wjqdIU4BHSEj7kuLWvypuKAcbruIppjKbC0GfinCT+3zYEVyvdjR6iXtALuTGGXTp6pk2v1OPBX9S5Wgk8szwTxOR2ZTogJ5PU2kHxYBCYb4sEgVHF5N3TM= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x6Ef6bIwjoMTWQKriQ8FsIDJi7J0mowpfclTfxwcrP7ExKE+OgJyWO9Nj6Rt27XM86YOGSM7rw50TWtGTQJcz/nnxvcmADzkvMHed3dOMUHo/lKFJtPTcaRKd25I17qYJ8mfTqSOyGb4HKKc6R5vb+zSfYMwQtD2wTwdUmbqcM39ESaIFLyDg3kiwMYmBqJfXZYWBLOTc38h4Ht6orqoggDqooSjIDGN6m4LBHnHkNeLs/URpIsaxnYLb+7cNvVZ2IpqhmHCnShwaHPrqntC5sh6IkjfW8/7/RN2yHii2+G+fSd99bjNOMe4KsAm/o91p0PpxtjWxnS0br/1l3woPzVVl15rf/Ru5iUS1e16ipdrZFviylXIufzfC6gTaI5YvVATwXsTqQYUWj3Xfoo4hSLTLRKQdHnPp8ubuIkATCytxG+RRk42MsQ5CB9hc/uvb326xCyGS/UJZ3MHC8oAdOuNVh/mlvLILt3328jnUqHLAJLY7rq6+Cp3g62Nm9Gkk8S2clig+PwUf2U7WqzGHeTskVcgzpC74rijfSyWcevp2+MRmee7PyXJox0I5fNu X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MW1JVzRDNzdGOVI1ZDlYT3RSeEpiellaR0xTQml2Qnh0V2ZVRGpNRkxiMTdo?= =?utf-8?B?OWtubTRXd0FqSlJtcGdvR2hUVnJ6d3FWb0xLL3hwWFByZmlKRHE1bjkxZ2dU?= =?utf-8?B?ZG16Zy9vb0p2YnF0NWNCMEVPdUw0cUs4emNhVlJGTHVzMU01QnFTM08vZkxV?= =?utf-8?B?a3p3ZjhnczV5eXpSMDIvd25zWjZGZ0M1V3VtZ1F1MiszZlg0MkJiSEdsZ3dX?= =?utf-8?B?MWlKM1A3dHpiSkZBZVlaK0xBZlR2UTIxbUlSdTlPTkJHeGlWUkZ3NVJYZnVm?= =?utf-8?B?Vnk1d1RFck9TeXNXb0VYOTNiVlc3RTBiaDFxWFVjc3o1QnJaMXNWKzJ3WldH?= =?utf-8?B?eGEyWkRDRVU0NnZaN3BZNytlOFBsNnU0NTJyM0ZrM3BmTjllVGlvSlVEaXFV?= =?utf-8?B?ZVdWL3M2enFtR1VRdEVycGZLSGxhN3ZmZzV2QnBjdzlqaG9HUldnd0hRcWRD?= =?utf-8?B?dWs1anNvQ2ZPL00rYmlmYnpiOGRVMlpFa0RheWNqR0tPQWJ2aFo5YmFzYXRT?= =?utf-8?B?TXRISThqc3I5ZkdEK3puRDR4UG0rMDVUd0NYUHYveldHbmJkUnJxS3RQYm1h?= =?utf-8?B?QktCL2U3d1F6RU1Ba2ZhQWdVZzJ3YnJ3N085NVFCQWwyTEtDNzB1MFMweUly?= =?utf-8?B?d2VjcEhOMGdtUjdBU2NyZDkwMW56Q293Wm9YSE1nT1BEeGpWYVJGeVFCVzFG?= =?utf-8?B?S1hoVFpLVmtBZG1RZDBKbFpsOXk5cEpvdmROaXRRTXU3MGhqV0NnTzgwZnpq?= =?utf-8?B?dHBnYk01aU1uVTB6ZzhkQVRnbzlMUWpJZ0xyalFGUVVpb3cyd1N0M1lmMXRW?= =?utf-8?B?bkFtMDFiTXBIaExHQUxWeVdwNDNna2sycitBM0hxOGZQY1dzQjg5L1FFR3hM?= =?utf-8?B?Nnd5M0kxaDFjblg5V2R0UlQ4OUVJblE5TnZwQm5GNEJNWFdIVEdveEd3TzVT?= =?utf-8?B?Vk5vU0Mrcm9tT3B6TFBxSG1yN0RCQTNwRWdXaGIxaVN2WldULzUwK1o4V091?= =?utf-8?B?VSt1ZkZvRzRVWjRTRTIwWTZWMjJ6WCtVU1JtK2ptSzJDeDBHbFpJeFRneko2?= =?utf-8?B?aWljZGJEeEpMTElrdGhrRDk3SXliVzBaS25uSkh2blFESEhmVHVJVXphRUtn?= =?utf-8?B?cnhJVUh1ZWhuNUJteTZmRUpjRTk5d3kxOWsvUExmOENCOXloTkJxOGRJY214?= =?utf-8?B?cjQ3Q3p5bFRvYm5nUThBRHZsczlpbVlMVTZ2TTgyUXlJS25rcVFMeVBxeGp5?= =?utf-8?B?cG96MXRDaTZEdzdPdllySUhvb0tWM0EwdVc1aEt3QjV4bUM5WWpCN3labDc3?= =?utf-8?B?cVphTGVvdWtDM3FUU1RYdnlQK0EvQmEvRi9ycXJJclQ4T3EzMExHMjFabTRG?= =?utf-8?B?VEF3KzhHM1JhNEFyNEJvb3crR1N4ODBtWnAvMmQyZTN2NTJvTDVWWjA3Q1g5?= =?utf-8?B?V1VxS2JlRE1BTVRtRk8yNlVweUw3cDlQdVZZV09RamYvRHNmZ3RNcDhSNzBn?= =?utf-8?B?WlpZaUJ2TTRqOURHdXQ4NTNxRTZMRE41Yjd2aDFFMkdkVndHazRPQ2hUQUhx?= =?utf-8?B?bVYyRVNUakhGYVE4OWQvM1ZWMHIvMWdWU2RKYkQrQ2RYSDA1dUtreUFJaGlR?= =?utf-8?B?bTNUdmFHalNLNnRCN3FLdk80ZGZoUnAyekExYnlxcDJUNmsvRWtaVzdqaWFq?= =?utf-8?Q?rDAQs/fYKEjWD+oZ1zoA?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e6292d25-987d-4fcc-c98c-08dc26f15b87 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2024 08:55:24.7296 (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: PR3P250MB0209 Subject: Re: [FFmpeg-devel] [PATCH 1/3] avformat/avformat: Remove dead check, write-only assignment 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > For muxers, the internal AVCodecContext is basically unused > except in avformat_transfer_internal_stream_timing_info() > (which sets time_base and ticks_per_frame) and > av_stream_get_codec_timebase() (a getter for time_base). > This makes ticks_per_frame write-only, so don't set it. > > Also remove an always-false check for the AVCodecContext's > codec_tag. > > Signed-off-by: Andreas Rheinhardt > --- > libavformat/avformat.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/libavformat/avformat.c b/libavformat/avformat.c > index 8e8c6fbe55..1a99598d6f 100644 > --- a/libavformat/avformat.c > +++ b/libavformat/avformat.c > @@ -775,11 +775,6 @@ int avformat_transfer_internal_stream_timing_info(const AVOutputFormat *ofmt, > || copy_tb == AVFMT_TBCF_R_FRAMERATE) { > enc_ctx->time_base.num = ist->r_frame_rate.den; > enc_ctx->time_base.den = 2*ist->r_frame_rate.num; > -#if FF_API_TICKS_PER_FRAME > -FF_DISABLE_DEPRECATION_WARNINGS > - enc_ctx->ticks_per_frame = 2; > -FF_ENABLE_DEPRECATION_WARNINGS > -#endif > } else > #endif > if (copy_tb == AVFMT_TBCF_AUTO && dec_ctx->framerate.num && > @@ -792,7 +787,6 @@ FF_ENABLE_DEPRECATION_WARNINGS > #if FF_API_TICKS_PER_FRAME > FF_DISABLE_DEPRECATION_WARNINGS > enc_ctx->time_base.num *= dec_ctx->ticks_per_frame; > - enc_ctx->ticks_per_frame = 2; > FF_ENABLE_DEPRECATION_WARNINGS > #endif > } > @@ -812,7 +806,7 @@ FF_ENABLE_DEPRECATION_WARNINGS > } > } > > - if ((enc_ctx->codec_tag == AV_RL32("tmcd") || ost->codecpar->codec_tag == AV_RL32("tmcd")) > + if (ost->codecpar->codec_tag == AV_RL32("tmcd") > && dec_ctx_tb.num < dec_ctx_tb.den > && dec_ctx_tb.num > 0 > && 121LL*dec_ctx_tb.num > dec_ctx_tb.den) { Will apply this patchset tomorrow unless there are objections. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".