From patchwork Sat Feb 3 11:25:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 45991 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a28:b0:199:de12:6fa6 with SMTP id cj40csp1508242pzb; Sat, 3 Feb 2024 03:57:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IFkpCYBC/9gwmS6o6c7TVZ7YbsOzr2lS+LuunQscyqF2uIguDQVUHFlhvfc7K0gfHg1/5uD X-Received: by 2002:aa7:cf06:0:b0:55e:f0f4:1b8e with SMTP id a6-20020aa7cf06000000b0055ef0f41b8emr1493774edy.13.1706961472897; Sat, 03 Feb 2024 03:57:52 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVDMJLKQJQ8KO5EtltOeN9eZKfWsWLez6P1xHZzoBbz3mI5/kjLbaOCqs++blc0H40AuUkgJP8jCqpLNQ059JxRoMJ1LxdO5fSFo5swEGcmowRupOcyyO8UaeBgYac5NQ8J1jU82h116omYWvilNuFPm1DrwxDSiUMGze3lay15IGRZav/ZAZgo7+FLuMX+CuX7RSu1qnAUyA7qOLDbLlJ9IT6wo0VXKqPmjo8J/Zq9+nCjNMxNYqVBmvUGrH8mHFFJ16Dl7StSP6lm2ZQ+R2Vlww4DIAfBDG/LIepclhPln4GhzWFkfcbdPxiGeERCTdQClnxnV/Zlk9HANNX+sqw/hzKHKn/BKOL2RjBwnBCvezjah5zPsOGK93upYC8hKz92vAz6YXhXFR753WtCAe3qMgcK9riOpk5KWOSjVFxMoyX6gcPQfhpZvd7iFwefIN/3b9V7mZbIUcqPSPUhcX8y4wdWViCwBorQ1wdL96BqUuNr4xpEEX7hxys1lcnoYygKPX/eh9mEmm5ShkhmAcixG2Tj2BOmh7bli/GQrTi3aY41qQfDUcg7/QIS51G8rcmE0QK221v8g7G3tSf/qHC5XvAVdJ7VQ1MqrxLuglo+MT2KcyJ2o23gtnlhm3NO0Hzy3SOyZ4X9TRB/XxcmSW55lPaM3M9wqLbb1/RCk9ZU/4jMN0d/S3NZ92CJgpkD3WbTtQKQZUrcLbhZmn0PYyjon9m7dc7BtNvboVCID+X3ZDVjBr0RQLKMdwZt5ygpK8mfoznhX64pJ71z4qrCtQ/FPifepRBG0ucmK6CLkXfxx4V0uGAlq/5EzEYju52ymWGu8Gb9mAiZJjzcVsrMJ4JX1hMrgiBW62PRtKvlHj04duTL11hqpIgtIj2tTpvySiPOZ5i7H2P/CPnOFrmClv/z0RdbUD/2GyAkIywo2u4H3ZHTutiZPi25U+jdF0tVPfa6Mo gtNP36GVXK8m7B+1dnrNVIldLz9cMD+gKWjuDHmekwx2MbzUWoErLRDIJHz7CH/nAC7jcpj3Z6e+f2p1GxRldFtbXTpcY81Ex0tlyu89X78yvM8mO6rIvDEtDaLp+zpwc0xvln0Hz3HFamj5EEhHN2pxxSjtAkAiLgjpK2T6pCiDfu+DRRdcPO+wpffM5/CuCafaeOM6m5mR/4D2Ir70rsLiZLmZTKk5UkIlWqE5SmCail1ER33ugvsNGEf1lDdEo7EMAPr1hF4g8GyCd5VYsiTo7V0undYIY6R14YMwsUR9MXMYseCHLrlNXNY52ijZVkKiNAWjynHkguv7ugt1PhI//sCDHFFwadzlKIQ92zZnYl91dBEbkk+2eLgc4SLLLCfiG7b0WyKNr6yDbil+zyb2JXjYQh8gvMZW6lAnQLCL6Q0RZSwKicfStOZNZF7blq5pZkjmS5YCfEQ/S/GSRr2A0EnvrAosxn9ZYx4nvPEGR+79p33YbCfHN3n7qH6P/tCQO0+88D6Yd0ZChmENdnZEITSooFf6eM5iLio7FmSxLAAetm3z8y9NE5aMyLnhPpcVwJlH9UhpUSREqIYGmL9ymRIp0iDqrn5uLpK+YsNG577h076O50vnPd83Y5vKbOiIAMQ4EXtAI= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id eg13-20020a056402288d00b005588b35087asi1706571edb.307.2024.02.03.03.57.52; Sat, 03 Feb 2024 03:57:52 -0800 (PST) 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=ab9c5XLt; 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 18FB268D12E; Sat, 3 Feb 2024 13:57:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2054.outbound.protection.outlook.com [40.92.66.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2A1068CF80 for ; Sat, 3 Feb 2024 13:57:39 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BiRazNJ9YQwdrUJgHqLvp2jRWZlfFv4ZIsyi5ZfE5kEq4VbG+UU/h7dLBfQAz5EhV2XIzx9CXemkmkpbQA0v+LHsIqy2cF3PVeHEqhRBG6N2OjwXJqwEtFyRQwMNbRzMjhvKDcJo5cIwJyXTssfWBN48WwfMzfpRwRJ2hUzKyK64HZjRWQrqo7ksEuGhrgT5Z29SwzZO7Me87IzFK2Ru2dizmR4JgTNx/BwG8GnKLuEcEm1WeiUmxZmmaog/TLIQt9q5VbmSeS/F/cZPf8B43IU0sOF2w+Im9Y79/waXbvxeHHUlb9+IixNjf4pG9Qym9YdSbtbEFVwTLn6PcRMzHA== 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=bvDm7k99dGjuplk8kVg0XyKPd6C2+S5Vdjy/4FrtZHg=; b=aYAU0njeJuD2jr2lMBCHBnMQMIQxvV7CVdm8VmnzWTtHnQjEHIxaX374opuWZVLlTBc/u++Ab6mrgVZgRICG+QVVcumZU5GHPavy3Aedr38Q3EUpr053VwR930G2dmngH56v8grC9dr901DabvuyL83Lfkq2cH7KniQhNeuwyMerxpQ24STC47E0vDrOfhkFUHjvyzpsTQZiWh/tY7AQl6219zDqS4uYb2uBg6rpYAfeRCGSAvgcFcouuFqsMwQvzcrGIHiVS3A9MphDbWrBfMeldkLHIUNdmUoWf3R6b6QWs1xqjmCTq3Bl6mlPbnSLj1uUTKcLdGcJmQ1M6RP+Rw== 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=bvDm7k99dGjuplk8kVg0XyKPd6C2+S5Vdjy/4FrtZHg=; b=ab9c5XLtfJ1HcvsixWmg0Sv6BMEllH/Be27I8kR9HVmGl5DyXs6Rk7nfULvqBolSTZ89rMxb7yeWIQegibz1HwoHCG/1xc5k9TgK9KUM6DPkVU1Fo7Kbs5Hrj91CqcJOnT+TuIevr+m1g5G0Uc3EO8gieaFBeA5iOljdG47gRr/GdTnONgnu0Bq+M7MR45k1Sp407CjFC0FyBkfQYnfDncchwzzmdifFs7u38X6/HYPsLGuT0D8NuoE/CQlsp/FwWBwoMVdWX7JX85Wvl9EjX5PlvL8YvQmK5EOKsPSCTCKMVkp5w5ius7O09GgATUdOMSeyIoCV1Jhc1R7f8nEx8Q== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0122.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:36d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.31; Sat, 3 Feb 2024 11:24:16 +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.7202.031; Sat, 3 Feb 2024 11:24:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Feb 2024 12:25:58 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [n+3VtxvJWqi3IrjeJNzjDDJ0G16Q9QeRKMgAHPcNnX4=] X-ClientProxiedBy: ZR0P278CA0151.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::12) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240203112600.1922079-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0122:EE_ X-MS-Office365-Filtering-Correlation-Id: 3a83c7cc-afb3-46cf-d649-08dc24aaa7c8 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JlDku+q79XePsoJkUlDtBypTS8fLx+ZoUt5YtG0cmhz8WmgEcL9VWYMq03vQwzAF6cNZjmZKEnq5v78Hf953L7DciRDbYoJxhU+6CWjOV7wee4iJk3FWK8OdO3959wKXjbt+yuTGgHxJJTMFJJEJkMTvFavBJ00ABWJ+AuNytUpfnOPj1BPzDKoiAmydhBmuV+HJCZmrdioGO/WDro5UgUwAP8kMa3u0FcEjFZ5jrza5frs7dEftI+0kGPccs+kg+4lsd2vTi4UY65V8ktOzQQNjDAu5EtwkjZcWY95SKdlS1Hq2yNcPm6z2GG13CPwkzUR7Q8jMCi+Hvu4dGVf4zenkrir4Kw1nNB6IjM2QRYsBvoGisVlki9Xxy2nbLq+JptqJ7WywtaNbMmIotUD9Bfoex5EHfXkaZrXBfUxj0HLrwZlfKYsPeuqMYCweKtpVqY2VV5MH15G53y24tuKVlX5rXApfGjQ8ZufiUMKTEkKJlA+3vuEW30rXY/vyq40Cznf7zlR/G7u5vPNPoGpY2j8+jka5z7SsBiOQzEBas/9Mtd7hTJIiwYWC4YMtZnToI8UWJQCyYGnuQmhExc2UFQTxqlQeNXi4+gPoG+2B1DmJNjdDwEIJZ2WaPdg4AX+j X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nhPYul39O1wJ5/F532/KP4s2ZrBI0fc5xbgOA5PklVxNwvqF+DHoYeXEnMK8UYj0HhB/T9VA5u7bn36CqG7nUDousNIIMe+pOv6GODs3PEazd3opjJPuhAzjZy2xRn9GG9dYU+UIZHx5VdE2Sh0nNMXkFkcC+EpF2X6DsYoxwiaB3C9khjStXPCSigPoMKDdv+TRw0BN+gAajLXC2uaU/ZXU4kAbj3K1xNmyASrHEIuxdIipnW/Wo6/aw6tCx8JIsi+AKgsGY/wTCgqombUlGets0zNOGdWHj0Olr1HvJ7pHEsoTim3MUx4W0YjUxmOtLR9TplcfIGPlwWXzWNuKj3rXQg1+gugIpTiurGrTyr2nZwBPOhWlcwqkKVGOaHzhgQFRLjn9xgkaK7/Fgppd67AeUE9vxWL6VJMHD0qo5cIQ1bRNMhcx+iEmuAwJlPQyIfZOQRY1RpZDuHF3QloedfPsyoPGG94QGR3dh60C1T3ez0EYM7Yxb0ryxGd49BDrqH7vFz2PzKVux2+zuJnfN2X+F6NcWmDQvgGaiNOSsk/NIHq01qh1NC7d1+es7zkNkhQgsWjIvH9WfxoZIRJBG5TuohZdwTsRnKsJrsqtQRmCiWCV4UebSCDbCJhDrrk7E3tFWVv/mtCLH4e2+GR6oxnGPOvS0xbqLo+EJcVooej4TMTUOyHcxrOyFvpFJJsCwKElAoMkBKxPkaipgpwwyqgsYGxBJkL8XpGqQJwdV0Kg53Sh1Y8SY4FuENmzW7BbTdPqty920SLygjsGpWbCy/41xUD28UUM0DVSTMuFggwYNXz0t9B05y32Ahak8oIa/QSlCXiFLV9z1F4JgH6z0Z8l9QZLU1xVHODBKVBkyJ4o2iUlM1rS8bpNqcbJ/BopVJL+DI3eix9nZ1SwNdA9t957oKM78MINO6V4xgXvU7VmNb7w+iw17ZyRnUtSQXjdpmSvk3YPgfh35d5di3cJjpItgk3uYbswfvFmBPeyB9Fp1d2SsNskLB4Vcs1qXu7VRNR+ybQw9avJRw1Y/gMLjQwQF/b1QPRppPun59n9QG5TiS0s9L+V2r2GsYeNM7ebkXXh0M8hzv8Fl8GIXQDnc7GMoYqBO7Q2T9i2YiTYiajBB7Jg8tE14IdbGVApZ6pxwTCPzwRy6vIq8xLmXK49FHbD5lgV04zESuv7drNJLn2OLfLP3yuQ4BwaWn+fcf68+hnsXa20mV1tdqIponB4AKxBKuN9uNpqp9mRXIPhnjSNjG3pZ1SO0DH/6I9Xds2C X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3a83c7cc-afb3-46cf-d649-08dc24aaa7c8 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Feb 2024 11:24:15.9739 (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: AM8P250MB0122 Subject: [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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0oT+BOFqovZH 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) { From patchwork Sat Feb 3 11:29:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 45989 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a28:b0:199:de12:6fa6 with SMTP id cj40csp1498454pzb; Sat, 3 Feb 2024 03:28:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IGcEGneUC+SpB1R8GwEkC9YmNVe+dwcYlGZTuYgNn5lqAbwfUTkCYFLN7ihTRrYyR6cZpbn X-Received: by 2002:aa7:d347:0:b0:55f:fc07:baea with SMTP id m7-20020aa7d347000000b0055ffc07baeamr1469574edr.4.1706959704867; Sat, 03 Feb 2024 03:28:24 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCW03yOsWRfB4jHlfHRG+C1QErhA+FfXvzVR0oDCj4uCJlB+i8Xck/ZfGIyF1U2oS4Z7iVE11W4yQzZfEDMXOta+XtNkvlJlF50EjA6WcqAXv4cGX/jktJqbU0Sg7Qir6mNgDJ1HJ6igUhze1Obk6rnmDTe6hIbiv5I0KapFckMvNTdRGH18spdnaAGz6Yk7Q9wBunjgGZP47p9VQoQBlMqkXVaUAfCJdFEjIlsv42Ypv6bJ0UTbkZFVg2eRJDndSw9IxJnmxjBg36nvxb10WH+FV85Q7tKpJa2wdpqfq0OHTekQEBVoBbJoAxQvHB0mEh6FOcgq53V6NLnvsPc2pft20Vv6uSIGWUnvIFJ1ruxbYXxJCJrs66pqu1IRtp7XijyDfu2HlcoLC0TV7KY9GIKCqkqbn22xPkZgNsBRbfR9nTJrIYRASB06pXE4sG/Qx1v8+LS3hEbDrrYHZHV1mr82+c5FHI3AocoQqoQcPJTtJnXvu98CkzQinECTF7oyIsd7rBIwLN6d+XjeyP6i6jZRpALlxuNJIDIEljM3yAqCgxzXBIR23rTAVs0I40xoE/cmT2aWZ9uLt2rrmpGuJ8v+xwrfGsmRikEWuMAmcUZDyMGxRDTjXJfUR5p12vExB/jwe5biY6b/YoA5uzGmQZUJgtjKobjQdmNxbhXHGhpJzmQ2kCkjymadJRBOjF2rSk6PcS9ZFOgxR7yITU+G+vtRL5g+sK2aLRr2WgaOO0yKmtObHUHv3vauWGcPOidjvFzdra2M6ry9uZT/ox+wVkE0yTI5KzOub9QyFucwjnXqZGuYLJ6yTkppHmNcwJeuhiY3OdpUMlkDabZN0QtBTii3F+RFQtD4tTefpPWOll+DZ8wBrqwfeTUw7FXXe3qh6hj4eQbziLZYEFlFi+ISR3AqxZ+KFj+OpXi+bkq8QYqPccAaJybR1tQPGXJnNxmsVmTOY4 DQLMcd8wNR1ZiODBHzbTsIy7nwgCINkj8oiPUFf+LfzVmGs1tEqQuF0SIC/5knlbQmWJMmXG1OkHsuHfB3ldG7SeICzJ1v/lgK9JqVgQET5jnR2jEAcB3Gr5GWlCvJ0IT7Q5vYvP28YcqaTZVLwHKGGgHsWMBjrLwYzMiRtIxpeKnl1giI/lE4j1z/0K+NdQQ0V6RlEutmNYUk52AKblB8j3UtRhHmmvBicocSU0i/xWhDkvsshwubpN79y+yx+fHRCdoJ5QQZm/2pZKP+v0yaLYDBMfc/azZ2o7+hp8ue26n+Jc68h6posi2qHS0weP61xUorA/CP6TQA9DKTp52oCm9Nst83dZs9Zfu1WdWs1SIE9sXbqmbORnJmEvhw+p28xjJSoU4A6IbOTEKGRn7HOAmeFdJCxKTWEdzcpB7lAbEb2lzMEd8S1Mbuy1zDE3RWBoV+w6S2ybUTwElrmzchKabCpKfaPj1dRc1CqeGrq+eOq+gxhyJwrUX4e4hrx76GV9tCXylzdnX1r2mrf1ORqBRd8JlzXNTSPVipB8X0XFQNyERtVpxA/ElDd1ZsYh4OgiIGHqn8OVPPd2wA3ikenyBGgwbJvFCAmG+N4yK3SCmbCzJc116f19VpY3p3Eb8vWx/cYGM+blhmRBtrGw== Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f10-20020a50a6ca000000b0055cda999634si1787705edc.200.2024.02.03.03.28.24; Sat, 03 Feb 2024 03:28:24 -0800 (PST) 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=Sy0R+wl9; 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 2577E68C9F8; Sat, 3 Feb 2024 13:28:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2015.outbound.protection.outlook.com [40.92.89.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3362468C9F8 for ; Sat, 3 Feb 2024 13:28:14 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XT4QqcXpQbPfwOZXfBHCfWYuJzlGLGTwGUnClqUZ97P8AyuGyYIhpnmt7iqFYOuCwJxrgmPRvaurqTXTk/JyMd9M3e0zpGXEDcphxZrQ/nMNzhgSHv6Jd3vQObeWn2yHKKBARvcFr4A8IckjiDRYBfl9uiD6QW/ebNqRtYPUi/SJWXgwgkkpkr5smP1s62MzZubNjlD4rT+xLNj0xTYV6HB9hARIg7nO5SgfJO4YMUAuU4pdbJXu9s3yNHN3blQEMjS6eLa/0BOkTmjVhN/Rjnjhx0w8TL4/t7eo8R9OALW13mjpfcC9+n95ycD9VFd4QqFekAcoh3f3saOHQSYRoQ== 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=uQC1bqDMNYgkrtG9P9eoLXoRSqeNBfjQXjfPrbzQ170=; b=AsW2hxjR8n1Ry6TR0tIo74QhE6mPSdLCG/TbvdJgz56Oc27BWHyizIUMkniiH4ak0n1zitqcTzmMX4sUn6tfYjzxWv25GjD3ytaJc3Z81LSn1j2gVdKneXv1TT/T/7ZMJqsw4NWAAgb8X1DUvciJYirEGRlHIfi3IK6rjbQTuw6x+HmY3Y9IohSUhGqswC4NjVsp6k/xYiWIQW1oSJclgOuJKxlhpSl/7eGovhvmrvytjjdZKvLZkVYlITWQ/OH3wZwqCrLiAXeVbH18uspasP6Qs/UtoKKQbZASK+nAsOI3trPtR7kd1y18aQCWGwyv33sM44izfRymLm+nfb8bGw== 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=uQC1bqDMNYgkrtG9P9eoLXoRSqeNBfjQXjfPrbzQ170=; b=Sy0R+wl9+tHRAPgWwqwMGl3qo5gHghpfX4j+fZmusHaQpgvfe2Y2CK5NxlanY6g0gZyV/l1gmGc7bUD7QD8V+44MrNEWoyakIioaBWZqJ11ScNzkpm2kSYKZ13mGHp/c6jJNwHnNRVz0CDH8giiUGxCG4AwE+jI646OZ3UYjRI3FU2bCEFnXNzQFDGv4pnJ1kJKUsCtMCvwKfdu3UrvCwwjatsXNZxhxfHqPD+EpTKSsRc/UCXD4lOfa3AN27GA/Cw3jntnc/L4fxHK3LUxTPZbewQUzNRcmEWwA7fvgguh5nfSupW0vNgHuXsCo7F2u0ZUeJNlIpLML0xH8FDEewg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0018.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:3d9::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.31; Sat, 3 Feb 2024 11:28:12 +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.7202.031; Sat, 3 Feb 2024 11:28:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Feb 2024 12:29:56 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [4hrRsUFnxZhhG08Uh8DVpQkAvVsQ5mfd2My9YlSLi0I=] X-ClientProxiedBy: ZR0P278CA0005.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::15) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240203112957.1922148-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0018:EE_ X-MS-Office365-Filtering-Correlation-Id: d84853d4-22bd-41c5-086f-08dc24ab3468 X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicB5exlFIk//zGC0cdAY69O37+bLjHGqNNacBKrwk+tVGNf48KU11vBNQJPuPduY0cGxJj02DIyNXwCMmCfEFs6X2BsR4GcjIuohvwhAAfrO3pLkuN3SDussXCNZRrG3idu6BkfKR1uFG0kqJHagdmPDFzOBCCjcAuRjyOA5AJDjXhpwvmlwb0LPDduDvsrPjWdFDw0tJpmxXly3GFw+Ag1BTH7PB8xkCKS0mVLkzO20/1qeZBY1HZwbcz7UqmGmB02Zc3CrX+h3ovNrid1EiQ1kJfYjDElqPCSPz2coA0xkjO/AXsnm53RKG1NkkIaADw4CrIRaW/veYq6nJxpGxZu9jhBI9YvnewmFEpe0fXo7oh0wQYj71xGg+FCcm0ma74AZURUCog9vGCKBNixNB6cFRqoPVfg3hulh+ri8Mc4YspEHqUEiT9MvRQs6K1wneBqSxxL0M+vzaJdosv8hPMEZBkq12SRe0E6czF6UrXcbpjdnYZG86ETLBTiD1OpkW3KQv+50nZ0ubku2DhL6kxKYGOlo5z1PJLPqWKgUEKn1mgn21L/OL1ByROs0Mglm1i4a1/M88UuDv33Vlme27XpCc6GWndCxZ72frFeQQ/orYU5+VVmCfLKAMOlP257YDxKRc3ORx6P/sBd3i2stQ2EZtaAjRe6ilIv0H2bqnY3E60r+D7n8RMtMSaUWPFjrP+ZqutCwxb3A+d1LnNS80sWoECc82zgOEBhCp9e2WaCadQ== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VXx+71rfv4wv5ybal/JT8k5rbFP3bKLy8wuvq4b+u83gLddYmzA17mEc01tLDQUFZp0J3WV8iVUgABKrmW3pEShoEUUnjZxsRMByTIBeIJnIM1ZM5mefmF4anACcFZjhglhYwm0WmrEn65tZxDftKtDZMkyRUpCl8B6K84Xm9mXBD3vGOzaGw5sgMrd6eNyfW9nHy/+NorKisz830EPFDhekmd7F8w5qIDa31nqltLz099A6NTw3E+Eky82ZDV8qarHni0Tw4bSrnLwZjBeggdw7xNoFkMadN86wHj6XGkjKSFHNU08dj/aeC/jF4uAW2jbnXZ7t4IZGWjPPmtTacGjBqx57BZJD5PbrNcHskLEg0r5kQayq8MfADgh9rhvnjSa7bsDSJ/gcM2d1sxkH0aEWhDq7Kl+la9TJDD9Rp4hK+MGwJ6+l1BnuhuK9TpRBwc0yK2KUEDV18HIlh1CWa07KkfdtshcXg2pVR3DHf8aRVEwFfhZ/k/MExNCYOWPSIx9fcZeqHj4k3n/E4z4ErV21fzlb9VqDm6r8TR90kvUmBz0il20jFwY5i92LkoGUF2I+BvBxmFH1TUYb9ZFfoExoP57HLS1TXvpiC2BJ4pmjHocRwSaAxVFohgzdcGFJ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LpaEE0uxs9Yb/OfiExuCo1p0AKgUOjSQe+Qy/hZnXpNJWuzjifjRfAEQdE2OF2nak+Qi2+i3RkJoNgPLGSQjB0/3AALqiQEvM3Xea6+NQFF0WNuqsJ0DI0F3QCuJUEQ+CgwA/CY4D0WYaKm1OYTugQiFc41NaVUii3U/az6uj9kIxHAcQPQaeAMxDNj8nrZL0miHtI2AG5R7H//nu9eK8AuBygdKtqjjm/M8SpwcmV16hmP5TjWUF8keoGtKWVfxRpCX2gJr4TSobnCMwFIKIwkfQbKDcw0vH3MJVJtTqocJl/IE3JbJfMkn6yqgb/EKztBylVmJl5RyymUqCVbQEypZlUg+HaZ2AZMrHH0Q74pxo1ACvd6oWXbJMPqYM2UD7xPuKLf+8w7fpYBapAQZczTltaASxKPBrmKC5hydfvSwEScmGtu8rLWaS+KJRSAt4t3f2WcxtQwAwL+vT0geOnZNdQmQ7Mfbu6T2a9HSp5a7bzSZTQ0SsNCorLwXMezuLq+qR9niBeOUGDhrJLq3tdEtrl7rWCi6tbHzNHaNiWfBSxdPh5fLsFfN2aRfxF/yRHrSqhpxTijq2c0Rm0ON/9JZBaC4pg9gNF3d236k/uLJOzVHNiJEAmo6oYyIn7AeyrOLSCfyWMfBLNpk08rIbkYQJ+9ueoM/JsYG6jFL5RIaJ9ReggskpJKuiZTjRJGTiDjMoqx6UJyDzRmSE+nwolqBkHyvKx8j7uLoq02/Dx61UebULyMGbQwybQjx56OwYDff0+n1U6Kbgcv7AxSn0pwft7PxnuX/rBclOqfpY1jZ5DXlQVVnw/3zugXMZ7GRzQbEpjhWicyZKXdvZk0Z+EWpOjcAULS0cLSNUB7RZCP+nmVT2TPwt9wcvNcZu54ocjJ+rtSCqHAXS+jB+Onw09t2Mz/rh3xbEJqLHNbA8Y4uCPA5foTMDK9/NrEpGjqVlsBG0dqXqaDpJuNpMkegxjp2KH99qAPlK8EI4VQnSfonlwSi6OscSYbfVdlG7IevR7044+EknJXECdlaSy3zEf7eka111N1a3igh4mXzxCailzFgparrFR+nmj9PCthBA6ZRp30v4XbDMrLjLmXvu4O25XwB9p8sO02HqcKTD2v1uboegoHkn0nXNopBtVjuBJickZzvFYtCwbf1kM8MucATHGnwbsOdgWjcI0XVC64z0g/4sLuHVGEL1nq5kZao8Ycx/Mf93Ova+XeeJwqAho1RFQRyxNd3bpazmD7S5Z9Rz/UasOII6XjH25z6xBdv X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d84853d4-22bd-41c5-086f-08dc24ab3468 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Feb 2024 11:28:11.8983 (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: AM8P250MB0018 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/avformat: Remove obsolete comment 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: 39Ldu7+tyANj Forgotten in 3f991325b5ef472cf51b7d8433a2380bef2c94ff, obsolete since 3749eede66c3774799766b1f246afae8a6ffc9bb. Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/avformat.c b/libavformat/avformat.c index 1a99598d6f..41b1c4e7d9 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -821,7 +821,6 @@ FF_ENABLE_DEPRECATION_WARNINGS AVRational av_stream_get_codec_timebase(const AVStream *st) { - // See avformat_transfer_internal_stream_timing_info() TODO. return cffstream(st)->avctx->time_base; } From patchwork Sat Feb 3 11:29:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 45990 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a28:b0:199:de12:6fa6 with SMTP id cj40csp1498492pzb; Sat, 3 Feb 2024 03:28:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IHXf+v3KCHYEXazAG/V1rKTsVlCZ8gag+4i3MyEoWH9cpMxrvOPquT/Mjs1b8sFjh/SdEsq X-Received: by 2002:a17:906:ae9a:b0:a36:5079:d6cb with SMTP id md26-20020a170906ae9a00b00a365079d6cbmr5925302ejb.56.1706959714092; Sat, 03 Feb 2024 03:28:34 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVK9ijVOncPFM/GcUurWRJ1ZT/evOGFJ3gslX1Zg7vliU7/vcyoEWlgUMV4N+hJjWrw0+SWL+U6hSGZhXLnnGZGkBQDJn0HqWMNibPlG7v8u9rQ+CRsmOoqfIi82ZOq9OUe2P7pPEc0mrES5kMYNH8/D63Eirw0WNl7XGq++c+nafRd4OAf48bYjs2AJfTqSsNNpNtZEyuGoDs3WxaU79+VK3VowVSppznvhMui8vM6C4yiO2p8CJkzkQwptN2V/mLuWthhcn+9OS8QfkK8hHNtZsH/cH6BW3jPLHgRF1PfmGBM3Ia4XPVAYhchdMuBI0aiJwzPma+WnEGHfAnZkbNpnDmQirrhmVuPqRQfZ/51/c5VNcKLoAtumqlbrhiOJPn37RVhpwq9lO6G+raMm5I/JJNT9wrpHXS8zjWLUQ4GxIUAkz2zLewAu6iG1hcFxakoxYIPimPaEiOfX8SObVrVbrTFhNjJU2U2nNT/ffGLntpcCE2NC136+iTslFLh7HLukFrCEq4Utkg2l6HgO6fSkoOEi3e93MjOAtrGySBpmfEGo/81JPKxY1lNvfMvfKMGZdQtvUBwznFy9mbdGBHJSvw81ObwK8QRjfJsEhMa6g+7sN+v0q9z+o1jIsIBX48PzY69yBtc2JlTHnRjCct+7gQAMLL97eTv3s6L/uwoi/I4IfNAsYm1aNfRVqbm1m5jI93NfHbf1l9OHbwLBNvtV0ca3YuuHvg5QX4R8y5PxOupKcfNWZKjZedYKyOWjvzgsztsi96Kg++RgwpJLjhDtL1ZZJZu/SHss0GcRZMaP6rdHq45zU4hHpEYZeOirA/hKzMwg3IIe/6YT85CUqcwlzszYvJ/3y17WSvhWUrX60krswfkQg+26lK9k2L/rRqaoSVIitR0k+ZAKbuQ04PGw+hCxSxsD77Ovpv9n3JD5/41DEtYZ9dbPFhVg5jXRHyVlA uYH16zyQgNnhPCfGtM/wbHIdON9fWfu4qxQNvCOVTtPFYwufJXNIsL158pEm3pl/0vl7j0sE19t0/RnqZDhUrTZ4jojBH+apUuwKw2bhYC9QqjFo5bj9OzfwSucPNKo/ZBnYXh9P+LzRWEmLKDIxDOhsS5aqy97mCsZqjmNKX9etqfkqdnqrvD1+u6nWp/orgNXvkw2UaNZmecitqC2zqzH06+vImv2j+/lVSXK+g8QCItU1vjVTzx4tuKg/NI1moAVVNbXZDtC8iIpG6Ro5AY0usOKpHC9vjC/MdTPBeDqCT68KXUnRUKsolTpEJi2ckCCt8N5wSe5P1GpHlr9ARje9jVq5IuSiXMIBRUGEVForvhUaoNLiAVXwPEHjIFLE/KN1eDdjVchQ/TUj4NaK+4Gf8thIZiCjGeW7TfeIGqAMeU5MRyLEADUKSS5zUTaZtsQ07dbEetjqXucnU/Syw9rm03qVx+IujKl10Y5sv8Yh9JBZXNVakt9iR9vc2SNWiPReCHqxXbkBKDRdfLZD3iJDv4YvZXIavaOJc6xmLyyLsUDq/6tq/P3aEDOhYQFm5JQrSbM4XqTWYgHb+akx4tgwAzk28xYYoJ7DLpZLCYj3hpfIHBOl8RC9/twYmOMV9qKwEd3L6Ne/fR20o= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v27-20020a17090606db00b00a3281fb08f4si1714309ejb.824.2024.02.03.03.28.33; Sat, 03 Feb 2024 03:28:34 -0800 (PST) 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=b8T279uz; 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 3BB5C68D121; Sat, 3 Feb 2024 13:28:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2015.outbound.protection.outlook.com [40.92.89.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA14868CE0C for ; Sat, 3 Feb 2024 13:28:19 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bPCiJeWaFv60d6xvc0xSG1s5Ka4/7i31DZWOl1VQ7mrcM9+YKeYkintod6PiTEP1KDaODyfAYPoZRabzMlAHJ99xt2Zvto0Z64nxFfAq6tfOYOWPvu6XDx+VIaDZaxQ2iMC4/oOJoFxDL/CNyke0p5TRzc7ZnhMatACaehA4JWUCKWTJKtGVF3Ru68BUr1Z6/lcyMsQf3BoZGqZrYwwY5zggPU+UJtykdZNlk4w4v1NpXaMKp3kKmSoPE21J9Jh9aorX9FrlXYSGFOjDpHsiVpHWZcQI8SgKk63Ls/yQ8OtyFqyMnGKpARzqAGKfvqp6649wcpXvhKd7jqyGHfJDqQ== 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=UqZzDtbWlvoVtNQ7cgW1lMbCwJK7XKrbwXOCDeZsnt0=; b=Dnu6IqrYkd3Q9efThsk01O92nRipDN3iP4UCVm1xG4gwjEVzKVI6WH/S5Rso210Yw4OKPVQtjTuH48FAvvKKGf7hVZqSTJts8/YTf/mvseRXWGXCMVM3XU+qd48HowK1yWSJft8lj8e5gQN0W/VjmRtuz0sAu6l9m5FI194CH3BoK2bxxnjdSv3PVSuC8m5C1f1jBXOOWRhSWcX6AX0SBSeLS93ruO2M1S2b0f27FkzFY41OEnE7/8WgI0yIEO93Yp7DdyNB9GadCcQG/gyIotAM1t4RNRPuBe6HXbphVybUms+t2i+REeTcLQvQ61xlxxkDOEL7LueZbVCjZm8J+g== 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=UqZzDtbWlvoVtNQ7cgW1lMbCwJK7XKrbwXOCDeZsnt0=; b=b8T279uzlabsmp7WAbuMl9B6Bg7WqzMfqazOGVlJAnu7M0xtdKCQUAnV16P4Bng4H14NO8wlcnJX/DpIR38RYD4U5bo1ffFimrKAt32DQJ9MMBYHWZ18rzdCcW9rKC4Yy9p06HxS3m/zwKk11DjJn2cjIuoQOT23lOK4vHn3VqNLSJ1DHyr1c9P92AHmsxgI0z41jE7cZuJRJcXcCRDRPnBbj4kGk07lYN/MfbXVhKEK13BBX/SlWH+PmM7zSq4t4qd6eVR7/R4EFemC4xaZn2cYWmz/YlzwfbsHKRe03DMG/dPej/xserYb4xjpD47XUsrUcpwtStlcjCajzH9c+Q== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0018.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:3d9::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.31; Sat, 3 Feb 2024 11:28:13 +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.7202.031; Sat, 3 Feb 2024 11:28:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Feb 2024 12:29:57 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [nHIzweeGkU0MAA7FpcuCqXolCcsAm4imSgaP+spSzWU=] X-ClientProxiedBy: ZR0P278CA0005.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::15) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240203112957.1922148-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0018:EE_ X-MS-Office365-Filtering-Correlation-Id: d3872d8d-cb0f-469e-82c4-08dc24ab3580 X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicB5exlFIk//zGC0cdAY69O3Htex1eHDhTBHJAW3fURVc3GDYSjRqVGerJllU0lqkHcP9vHHTOrHHO90/D0DqTWur2GQrGGfHINYp8rpG3xwPenE68PQ+6qG8PD2vlxY81rZM97TT8O+Mdk9UYPOnt5MCb/whkLvPFm4LzZEfRMVYnxDGYNYV3UX/wVilZ1NViRdOoEJ427qCKhhmKK2/lUiKxZncrTKZqW3x3cMa1Cwc0rjXtPa8M/EdKuuH2054Kl9bsLaanyKczKiAYkVzxpokj++PK2PQj2DAAte1s73FO5JN6e55qsg/bJOPd9hlzZhxpwbiFTRAJoFDbI1XKfgnWlH8QiU1GDVQr19l8I7zfKJ+byY4UPdqncruGpn5tljm5WNQYFB2SakQwIu7gb42ImNcOrr5EaNsla/Xd0HVUGp8JpUZIHfQcUa+m24cbBra6ars8691DzFvqIeKhGLKqfdFNevZ9gd/TpUEo15Qm/+AMpLHdzLjJDj5Ma1DQScXxJCOAtw0A3VKuxdORgvlJ4MA3tOqmJS2F1Y5eJ/5W8qdn2pAPOMdJBF/CdGvM630mRzSo6kW/Fhvr0jQTp7J1AP0SdSjmlFus+XOmfIWe8ECLa7x+MCWBGPy/tsycojtaKLqjVvFO4qvIi+d3As4dvCXUOiut7rnaBCgTnpqnGt4xP168pCc/ytU1xjIuSeOw9RiOmiXrbVonSPaQ+Qx76BQsCS8NQkzrsLos1Vpg== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7AERVXj3VJgF6IZzk3bJNNRTgivaibR0qon8uGCyLw7uHWPCluqy1tyiBuArB0YBWGFHswHN5vO7XVV7Yz34mvt5GZhZBjKoqQc/GbNAP7X6yiEoJL83cHjIfh0O8pprQGc5RFBAXx3vnHQxzSNrplUOH8dhPS5SBfh7ajYghF71htArzcYrSwwMO/c+bdgoaCVSEuZAxNJ9Ceb/mAEdHx4K57FbJ7RX5t73wFti30rCshKBWT0E+O3YgnnFiK8fkclNd4w8T1zjQd8f+kCCk3J2XSv9PFQUCHD/c6BxJPspJ7+XfOqKOX71QEuQu6rRXmVRIBHSKueEzu/DjoZYd8KISOg8PBOmUjQJ9rdt0gTzulGUqxqhMA5POmJ8Tj0qGZQ1yCs12RmPaQhqxqHkA8K3YhvzgJlwQB05W4ZO0IzaL/qdDqkJUpIuMrU3TFLybNYWuTKJ7CXotTBZ48oPC1uQVrPoYPp0fyWoXXgyrKdzZl8fiEEh8o5UMs0gM10CwyQmjsinQ1Kz1kewRI1Qz/5OGWrn0nn6oBCrgu6h4Ef7MIyfPQXFInhlBRZ6hQZwdp59AgWiNKMgld8qSSFlKxLOHxZi3aNLb8y1Kcq+NLzHponiBck8oUhg0b+CcVP1 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5RPbX13w/xHyqrjMuenMTl/oiInGsmsePZlOJmgnZdM2HINNi5ehATbMQ+DWqKpKA6KVlzf8C3SFnRG1kja+T7hosSwGJO3Tbei/FdQfc7puh6WMB/YcSacLMJoXxQOQcAy7BNKSFnPhT0TBNSo1YQmQu/oiHwHwsqbdjjV+h1WFUmWC9+lQlnAsDSPXBPfFoQ11TAscsocLbd9nd34xIu69DKrZzbvkAgFzVf6y/A52nbVva0U3lNeR8X4uWK/s67HVV3cKy3sK3hXe6bTN+Q9CPTG1D7PKVyzplxyOwuENuUE0TMuqpL5wZigmJMfR6bRqz6KpHynMYvlEVwAC7aZjNW16pu4lFJ/y1DKZD6EwvfyDfQPzT0U6vWd7OagYiL91Zbr0meUCEiJisgykAvgKeVzKzIbuJ3VyJhX+NNZF/OaN2Bqy72rYW3OKjJdEmS9lTI2Ls3aman0GOit7547sfCya/+UhdaOBNQ1At5M8I7+ec8SJLBF6FMgWYQSlgYWgrlWphhouhOwRrR8RV5cKsfJWKc8RtsH1drtfDqXQ42S+NIdLoEULgfmSkFUumy1+Gun2NQ8iVCF2EbD7YF2elkCNgfWT7U0qlHxIc4+XiZMoxzWLglwbl4Kw5+EwNP958UP3aTWZuQkRI1084Dom3pwBRS1/nFDCp9YiBGP5Q0DUOrEgga4dupyKuIxN6jtN4msF8maE9PJLAwa2gf3HVc7Di2UOMFDtISje/OL4Pu8trCNqcUcUQud4lzvKDx2lgPjXN/QYeSAT0hPe78itEgqxXYbvPJXzI5q63HF1HBhRjRPit+ulX6BaoXQ11gcT8Ih+2NvYGUXDSgyPqRomSEVt5NnCBfCKxbMc89u2RuVb9B7kinihYp3umiiM0+XTuMGXYeX4We4hHw81MMQa+hflDFyrSkFrMnsuUVDeKd3UmVES8Q9pcVRInRjj4rBh2/ZCs5IzGWo5m6FgovV9GVrT54jU6ZkR6gO1Tdp3ChrX4ZndAiUXKsb7M2wjCmEJmX0Z9qK7Zk1Ynhg17roTsg6+2hiPhvesnZvOZK7haAAEIC6UFtOhGiu4i+4vOLSFxK3g2BV1UtrMnRjg6TFEQfYSZmHpfI3/omfqqoS9rl+l89Voxlzp1fPumrkY72posCJ/Gr5X4Z86mtXwkC+fPaXWyWLDpzo3eB+P4gLKsyNJImtYxXVCcbTmjBwDg/YgRrya1fcSQX3742tpqx94emkt2nlmdRfrmg/ZOhUDmwlt8ksNYgkfOTTsiS1a X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3872d8d-cb0f-469e-82c4-08dc24ab3580 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Feb 2024 11:28:13.6923 (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: AM8P250MB0018 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/options: Only allocate AVCodecContext for demuxers 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: 7qmS4lhu8fOR The muxer's AVCodecContext is currently used for exactly one thing: To store a time base in it that has been derived via heuristics in avformat_transfer_internal_stream_timing_info(); said time base can then be read back via av_stream_get_codec_timebase(). But one does not need a whole AVCodecContext for that, a simple AVRational is enough. Signed-off-by: Andreas Rheinhardt --- If it were not for lavd, I would add a ff_demux_add_stream() to be used internally for demuxers instead of avformat_new_stream(). libavformat/avformat.c | 59 +++++++++++++++++++++++------------------- libavformat/dump.c | 14 +++++----- libavformat/internal.h | 2 ++ libavformat/options.c | 8 +++--- 4 files changed, 47 insertions(+), 36 deletions(-) diff --git a/libavformat/avformat.c b/libavformat/avformat.c index 41b1c4e7d9..9cacaef87d 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -729,8 +729,6 @@ AVRational av_guess_frame_rate(AVFormatContext *format, AVStream *st, AVFrame *f { AVRational fr = st->r_frame_rate; const AVCodecDescriptor *desc = cffstream(st)->codec_desc; - AVCodecContext *const avctx = ffstream(st)->avctx; - AVRational codec_fr = avctx->framerate; AVRational avg_fr = st->avg_frame_rate; if (avg_fr.num > 0 && avg_fr.den > 0 && fr.num > 0 && fr.den > 0 && @@ -739,6 +737,9 @@ AVRational av_guess_frame_rate(AVFormatContext *format, AVStream *st, AVFrame *f } if (desc && (desc->props & AV_CODEC_PROP_FIELDS)) { + const AVCodecContext *const avctx = ffstream(st)->avctx; + AVRational codec_fr = avctx->framerate; + if ( codec_fr.num > 0 && codec_fr.den > 0 && (fr.num == 0 || av_q2d(codec_fr) < av_q2d(fr)*0.7 && fabs(1.0 - av_q2d(av_div_q(avg_fr, fr))) > 0.1)) fr = codec_fr; @@ -753,13 +754,19 @@ int avformat_transfer_internal_stream_timing_info(const AVOutputFormat *ofmt, { const AVCodecDescriptor *desc = cffstream(ist)->codec_desc; const AVCodecContext *const dec_ctx = cffstream(ist)->avctx; - AVCodecContext *const enc_ctx = ffstream(ost)->avctx; AVRational mul = (AVRational){ desc && (desc->props & AV_CODEC_PROP_FIELDS) ? 2 : 1, 1 }; - AVRational dec_ctx_tb = dec_ctx->framerate.num ? av_inv_q(av_mul_q(dec_ctx->framerate, mul)) + AVRational dec_ctx_framerate = dec_ctx ? dec_ctx->framerate : (AVRational){ 0, 0 }; + AVRational dec_ctx_tb = dec_ctx_framerate.num ? av_inv_q(av_mul_q(dec_ctx_framerate, mul)) : (ist->codecpar->codec_type == AVMEDIA_TYPE_AUDIO ? (AVRational){0, 1} : ist->time_base); - enc_ctx->time_base = ist->time_base; + AVRational enc_tb = ist->time_base; +#if FF_API_TICKS_PER_FRAME +FF_DISABLE_DEPRECATION_WARNINGS + int ticks_per_frame = dec_ctx ? dec_ctx->ticks_per_frame : 1; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + /* * Avi is a special case here because it supports variable fps but * having the fps and timebase differe significantly adds quite some @@ -773,35 +780,31 @@ int avformat_transfer_internal_stream_timing_info(const AVOutputFormat *ofmt, && 0.5/av_q2d(ist->r_frame_rate) > av_q2d(dec_ctx_tb) && av_q2d(ist->time_base) < 1.0/500 && av_q2d(dec_ctx_tb) < 1.0/500 || 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; + enc_tb.num = ist->r_frame_rate.den; + enc_tb.den = 2*ist->r_frame_rate.num; } else #endif - if (copy_tb == AVFMT_TBCF_AUTO && dec_ctx->framerate.num && - av_q2d(av_inv_q(dec_ctx->framerate)) > 2*av_q2d(ist->time_base) + if (copy_tb == AVFMT_TBCF_AUTO && dec_ctx_framerate.num && + av_q2d(av_inv_q(dec_ctx_framerate)) > 2*av_q2d(ist->time_base) && av_q2d(ist->time_base) < 1.0/500 || (copy_tb == AVFMT_TBCF_DECODER && - (dec_ctx->framerate.num || ist->codecpar->codec_type == AVMEDIA_TYPE_AUDIO))) { - enc_ctx->time_base = dec_ctx_tb; - enc_ctx->time_base.den *= 2; + (dec_ctx_framerate.num || ist->codecpar->codec_type == AVMEDIA_TYPE_AUDIO))) { + enc_tb = dec_ctx_tb; + enc_tb.den *= 2; #if FF_API_TICKS_PER_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - enc_ctx->time_base.num *= dec_ctx->ticks_per_frame; -FF_ENABLE_DEPRECATION_WARNINGS + enc_tb.num *= ticks_per_frame; #endif } } else if (!(ofmt->flags & AVFMT_VARIABLE_FPS) && !av_match_name(ofmt->name, "mov,mp4,3gp,3g2,psp,ipod,ismv,f4v")) { - if (copy_tb == AVFMT_TBCF_AUTO && dec_ctx->framerate.num - && av_q2d(av_inv_q(dec_ctx->framerate)) > av_q2d(ist->time_base) + if (copy_tb == AVFMT_TBCF_AUTO && dec_ctx_framerate.num + && av_q2d(av_inv_q(dec_ctx_framerate)) > av_q2d(ist->time_base) && av_q2d(ist->time_base) < 1.0/500 || (copy_tb == AVFMT_TBCF_DECODER && - (dec_ctx->framerate.num || ist->codecpar->codec_type == AVMEDIA_TYPE_AUDIO))) { - enc_ctx->time_base = dec_ctx_tb; + (dec_ctx_framerate.num || ist->codecpar->codec_type == AVMEDIA_TYPE_AUDIO))) { + enc_tb = dec_ctx_tb; #if FF_API_TICKS_PER_FRAME -FF_DISABLE_DEPRECATION_WARNINGS - enc_ctx->time_base.num *= dec_ctx->ticks_per_frame; -FF_ENABLE_DEPRECATION_WARNINGS + enc_tb.num *= ticks_per_frame; #endif } } @@ -810,18 +813,19 @@ FF_ENABLE_DEPRECATION_WARNINGS && dec_ctx_tb.num < dec_ctx_tb.den && dec_ctx_tb.num > 0 && 121LL*dec_ctx_tb.num > dec_ctx_tb.den) { - enc_ctx->time_base = dec_ctx_tb; + enc_tb = dec_ctx_tb; } - av_reduce(&enc_ctx->time_base.num, &enc_ctx->time_base.den, - enc_ctx->time_base.num, enc_ctx->time_base.den, INT_MAX); + av_reduce(&ffstream(ost)->transferred_mux_tb.num, + &ffstream(ost)->transferred_mux_tb.den, + enc_tb.num, enc_tb.den, INT_MAX); return 0; } AVRational av_stream_get_codec_timebase(const AVStream *st) { - return cffstream(st)->avctx->time_base; + return cffstream(st)->avctx ? cffstream(st)->avctx->time_base : cffstream(st)->transferred_mux_tb; } void avpriv_set_pts_info(AVStream *st, int pts_wrap_bits, @@ -846,7 +850,8 @@ void avpriv_set_pts_info(AVStream *st, int pts_wrap_bits, return; } st->time_base = new_tb; - sti->avctx->pkt_timebase = new_tb; + if (sti->avctx) + sti->avctx->pkt_timebase = new_tb; st->pts_wrap_bits = pts_wrap_bits; } diff --git a/libavformat/dump.c b/libavformat/dump.c index aff51b43f6..01e2306479 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -550,12 +550,14 @@ static void dump_stream_format(const AVFormatContext *ic, int i, } // Fields which are missing from AVCodecParameters need to be taken from the AVCodecContext - avctx->properties = sti->avctx->properties; - avctx->codec = sti->avctx->codec; - avctx->qmin = sti->avctx->qmin; - avctx->qmax = sti->avctx->qmax; - avctx->coded_width = sti->avctx->coded_width; - avctx->coded_height = sti->avctx->coded_height; + if (sti->avctx) { + avctx->properties = sti->avctx->properties; + avctx->codec = sti->avctx->codec; + avctx->qmin = sti->avctx->qmin; + avctx->qmax = sti->avctx->qmax; + avctx->coded_width = sti->avctx->coded_width; + avctx->coded_height = sti->avctx->coded_height; + } if (separator) av_opt_set(avctx, "dump_separator", separator, 0); diff --git a/libavformat/internal.h b/libavformat/internal.h index f93832b3c4..520f1a5229 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -416,6 +416,8 @@ typedef struct FFStream { int64_t cur_dts; const struct AVCodecDescriptor *codec_desc; + + AVRational transferred_mux_tb; } FFStream; static av_always_inline FFStream *ffstream(AVStream *st) diff --git a/libavformat/options.c b/libavformat/options.c index 75ec86ce05..03e6a2a7ff 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -283,11 +283,12 @@ AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c) goto fail; sti->fmtctx = s; - sti->avctx = avcodec_alloc_context3(NULL); - if (!sti->avctx) - goto fail; if (s->iformat) { + sti->avctx = avcodec_alloc_context3(NULL); + if (!sti->avctx) + goto fail; + sti->info = av_mallocz(sizeof(*sti->info)); if (!sti->info) goto fail; @@ -323,6 +324,7 @@ AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c) sti->pts_buffer[i] = AV_NOPTS_VALUE; st->sample_aspect_ratio = (AVRational) { 0, 1 }; + sti->transferred_mux_tb = (AVRational) { 0, 1 };; #if FF_API_AVSTREAM_SIDE_DATA sti->inject_global_side_data = si->inject_global_side_data; From patchwork Sat Feb 3 19:33:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 45999 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a28:b0:199:de12:6fa6 with SMTP id cj40csp1712616pzb; Sat, 3 Feb 2024 11:47:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IHsWUJ3/mVEbQeJhPwAHr+iBxoCyKlwv9UU+oskiP6cZr6Wffj9v6hIIQ0+PWuYAgGimLva X-Received: by 2002:a17:906:3082:b0:a36:f42f:83a3 with SMTP id 2-20020a170906308200b00a36f42f83a3mr3988115ejv.41.1706989641109; Sat, 03 Feb 2024 11:47:21 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXUDMkUtCyao62+M6zRxINsoEi695WGFvudiHUCQcHG0s0nIT+TgL7C/kTd8GuYaXTuec+PKiqWUcoNCWJllC02L+njr+6U0nx7MpiVOl6ZOC03N99UTPW/Ju0XGsxULNVXb81FzdYWzKJzcpeL5UQEFuPN3Jl82GJD4vgP/cP/jp5+yq3MSAwTvJEqiC/x0bHjeHcaKL7y3xoK4gwVp4bC/jEPVVCCpdl5UQUaUJL1Vu6uYax27PjTem87985JU8aEqfcugYupX8PW5UU4xiV7GBR24t/L4klFudmC3OYvESifanjowLZWAhIy6/q8qQ+eflNckLDhLVBan7DeY87/XIhdFVn6ijX0aIEDUebNA+lWO4HxozfnX2JV+WmTkTNidrczIRM6C6DhhZMBIr+5GBD04HOtR9NvhA7iVO2afQvi+hDLGYeWvlpPGj+4+sJ5mvCnKEf7NCG3+JkUgaQs46ES8j8hrwyo8w69MnHpmH6OVfH5vA2/NEfOm7gO19nSwWKVHbwjAaENbMXi8bYgvEUJQE11O97lReR0HRGLf/pONcUxANH5YoWicolqwheyMl1sPiPmrBWEt0K3joV8pKWyh5teIN5C3zh9KYplpGzBpWUVpilAQbndNzU69G7+9MGp65Hvu7ZR7EMO+IhMuu/sxEoKEQ1Us6+cg4oULel6yjl+l4XjtlosZsfstOATPU5JCLDcUk1OmvUW9Q9SzsAMSm01L9hGWCb6Wz29QSbzu0IDT/hFbBcKWimI1XTd+hqlM2vOgjwGrN3wKwnuQxpEqf7cPRwpfDzjZtiGJYAiH82TR+eQEOO2ajMp+2Xjeyfo9SWhrLLkOxxa0AMlfuiQf/C8BDpLerI5qfh4DdEchMLzegdjMavZA+7VMN2GzMknOIfBtsxLrnkW+g+jA4P9GFn8Fsb283fc8hKv1h74k+jps9YxgG6FudYflyMCnN 6wo67GfTkPniXZ0Kc08Ro4f+NSVAOOF+IS93mC/H2/ZFrSmM9Gbc0ijZU0qcfS8ts7zCoqTakHjz9+ZCKdbP1gZMtXIBliFxTAqcOa471h1b9MIwVxbZQNx1iUQaGo8WhGIvUvVCsj1zE5zwRtWwynKh7sdz1AmnhCYNH9+KAst8Q+3J8JDO7p2lqzS0Zv/VgtNdt2PQAokC/3FDecbFnsfSWX03UF7b11KL5cOJpdf6EGHvZsKSWokCpCKkGb4rdRjNnhhY0xWLPRvP3WrXWPproiGsYzYMyHK5aWNlmdOjfqTWgP40g3hNf3tWJjWl2yLbHQMttLNbYbt+fejPhwMaQ9jg72Y0XNbqcL0JxtZHlha5NjW0Xfv52FZERlcj5cZSTFK0D0aBb5V3EcEXYhNsIqgGxF43zNwFY35q+xGLX7EJSPxTDluDvQUZXB8H9G2YPpE8H4elUD+VDLI1SOd4iu4wy87LIlESLJyhBp4SlAn8OF2Ru3tjHGRlNgCtYEnUXDoEEQQ7UZ+3f73BhmxEqaLuPeUHKFmTsREkwuLlaaGCtYdNc9aUttLQp6e4m0WyydhWeFBCWsaMCUV+AEjWfmX/UEWTSGAxsClwP6 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ce1-20020a170906b24100b00a3538bc2ad7si2074005ejb.462.2024.02.03.11.47.20; Sat, 03 Feb 2024 11:47:21 -0800 (PST) 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=ovIfiSqo; 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 D40AE68D130; Sat, 3 Feb 2024 21:47:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2013.outbound.protection.outlook.com [40.92.91.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 581EC68C6BB for ; Sat, 3 Feb 2024 21:47:11 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DVqdGW6oJ0FmXJmfh9p0akyMqkdeqyotgBekiTUt2u17EqmPOHdhRYQe4UFvPK2GS8cgTqgEgH4G7qzKKq3IIhVoVmIftzXqCbYHLzOOr5dH1x2MM/170PYO+yXtpE0PxCE2JNGcfT+tgAG9J6a0FxJBix0rFO21ogfscqun1SOTf42l/+fveckaq/jxFrmmY3jduLxo1zh/HM8akSLYJPxyG59d8dT1Ux/D499h7CCSd0xE6JSberBAMP4acLt/qh/nKNflNbrnKYva+zzWw0zdSS00n19rOl6Qo01+lYZRNm0aRzhhoO4LSPYz3EGBQzb7yvUUbLLQc9GmWSpjLw== 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=awRyHiwBzcWTxvejSvV8o3YtdRjhdDRX30toBcapHP4=; b=JibkFPF6wfZUSRWVA4ovCIMPilTEtY5zXWdXVKNtwuZFODR5dgr3sflsIxLFAHp646TPFKVY7O0OeBLRiE5PRvmT7x/o7PP5hzRgaz44XdzSH9Y5JmtyP86apJ62xKlbD1uDE7qlRYE0N6tXne7ZCmc090QhvrxBdO9uZ9391ieT4dTakbTrODYWbj0kuutmp2yZVLomw/GR2AcYTGxTFUjsIN5ZFmir6rR5TLin4rhhOeNo6gEICosNrv0zPJdVWkqH8iuh4yelgmg1tbP1J/VCh4KlE9kne/Z9W2U2kCOMNfnfeGrY8DytkvSkq+YNHUyr4JjYduGQBbE2i6YPeA== 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=awRyHiwBzcWTxvejSvV8o3YtdRjhdDRX30toBcapHP4=; b=ovIfiSqoVWGRkNi/kD4wbS4yKoMidXar1HJpoRi/5MAmgFB8v8mVSM32aA7Y8RvJLmH2S8j6tI0Zc/6IQQ61Te0eOtsywZ3fqw3tp8MPfoSRmjMpq0hmJbztXEHN37PMu1F2aQP81ERTU9Bc9MJB6cso1i47+psLaeUpalQF9JMWCrYjjYQV1ME77USmASseDydbOYm+S4jp1lFF5/PUxeZTidiBFQXuNiFyFjwwY2FPvyIVsa+OvUI4cK5XKmg7pUog1UIP14kJkCvd8bKYI8IRVNXtMoIpR6gc+nDsGeK33ZZoLd+gOTeHFW1qFCz7homK0zoZQDg/ZpJ7ctrJ7A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0005.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:358::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.31; Sat, 3 Feb 2024 19:31:42 +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.7202.031; Sat, 3 Feb 2024 19:31:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Feb 2024 20:33:29 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [lX30ezxlpfKUN0Dl8Om/J6y6CxqVEH78lKShdjOlU1M=] X-ClientProxiedBy: ZR0P278CA0146.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::7) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240203193330.2254723-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0005:EE_ X-MS-Office365-Filtering-Correlation-Id: c07f290b-6881-4962-d6fc-08dc24eec049 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ChFeL98mIjKwEVYurfG6ue+W3jeMZg2nvqDDimYQjAGU5i1nj+XOEn/zOtXNhUYWzjSYkoOPeMADimw814A0cG4xerwYgTGTleRVvE5ubnza6PajE7vSSRMn3e7oMwgQ805npvE4KEN0aGUAd9QJmHLTLV8KkprcSpQaxaadqD6jsuj2kA6SqshfJHt9Gl+Fir7IKa/p1hr+bArCI/o1cIhDOarDfjQ3VWpwNEnq1qAZIQoFwCeyIIcHU/XWFcJCJsq6DRrvExi8tnfhpmk20MFp6/Y1HabRTZPjiHKwESPg1ei3HXiW56kZalj74vD9yvn28ix31drhZn30e2jEzK3wHQaV52Dy3ezCk8RvYD850RiLypVLpkCxqMTXRa+NPOncviCj/3J3Kh8yukq1I92/0zk7XJrvGjZdncLaexpkb9NXdcGCbcq01hj9jGTDiOGV+XFS7rFDNtjKfbb7uy8XKhoWJlMfEwli1ia8u0Yxw6xxQh+R7Ape3epFfKokngum+yWLuxM2zwLFG/Db3VudHeUxoC8IWcllhPJNWUjFKTHhj02kOxJMzzfEjfqamZQ/MXeoH8cmHQ5QzitlZqfTSrJjw9Cq+/p12eQ3Dg6MhOHLgrqCnH5+SsHLTUr3 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wPMo/aomB0k+Z76ACFmQEh/KEI2bjggP1Dvls269i6rFM9e31BMgQqydCCqZT1tWtWWwQy4mdxCTAuJcJCTVtp9TzxbysW0TPQ/vQaoGPbemR5Ry0fNbwnUBwwX5YAOk0oesGDSapWTSswnlRIuIfWRUYoMzRhzEsPgm4YMdFpvrZIStkHf/ZWG4/YitxCwpWAuGG5XDRI6JHH0RpKvpiGsced4xD20/mO4LwYI568hCBI91jDt+cRvZFsidv2u2uc35z3QiAu51WeeChgcWiu+k5ViecFCxeFJkyTal3O2N492hL6VUfhhWUQm+RQpX8bL6Qu48XNryGfySYCarpzNOThB/YO6i4yjTWtJAWzosWHvQ85kPM4mTdyKT7p9zgrVfMOx4N9GTQwzAe4mGrC3wHapkR4x7mUOawIwvJtmm8+/ufG2/4sQNLNvttyv0u6XTn1JUZxroET+XKz6WE5MRshPR/2a9Ayxuq0TAiTo/ViUJo+Hl30xLsO4SPESw6N5ex8JZO8NKvOaQM/4RZFz3k03cUeXted5sS/waatFiy2feFq01rW+1dHMMKLjy+8sY5PC8hXjukLVLa0rY6rWHn7Cm6yQHW2Gi04vZ5yKAzvjrllVaL0IpGSRsD6PBS3G6atKjnrYt5ljjBOhV84vLUMxg+d13eLdjGUzQT/yNxwIY7cyiwjGGyxrsub4HFXTDeRUdfnFlVVNEgR+oUHdWERu29V2ZQ3KbHg85vII2tsI4TVNPafJFfCzYMN2Syh9eLlP2VVLYYhX98EwJODLVGRi5+sxaUFITMDO0fSlJqdmQvxBfN5T57hGLxpe0oUW7ueSjrzvyu+AoWJsAdRdSQELBDWlvnE4K8ju43gdI6CAXi8tShea8QNbzswpeHgsY3QA+xC7vjWtxLUSqawpN36FjAHPp1QMl9EyXB8YU/lbwa22uQjyETrff8YRDomixawr1WeAlwvZ7fzu6WRZ1orvXdUVqeqvtb3z9/yUlVyO8fdOSRJEuD0VK2yoLqEY6Syq1ZnNeRWkhqb9cjQVXYDefPDhD7YSdJDV3onRN7nBqtP9ssOzxlVFgQ5FHBXj9+eVILguHanHzHGjbKWqbSCrFrWsPn6c6LGWL9jdtc8UVLIweMwjK0gCaejMO9B/sg2PV4Tl1YyYHBGVKUIWhSBB7KB8zcXC1ktNXihFmbRuFeGkI1dOY5mC8MM8WJqxPxsJLjfnKQI5tfJlzQ1lmlmY6RQSTSJmNciO0asEC/32iM/SGa5afDD2ubNyG X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c07f290b-6881-4962-d6fc-08dc24eec049 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Feb 2024 19:31:42.8408 (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: AS8P250MB0005 Subject: [FFmpeg-devel] [PATCH 4/5] avformat/avformat: Avoid av_strdup(NULL) 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: 1QQkdmMle7d3 It is not documented to be safe. Also copy these lists in a more generic manner. Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/libavformat/avformat.c b/libavformat/avformat.c index 9cacaef87d..ae79ee6ef7 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -875,20 +875,28 @@ const AVCodec *ff_find_decoder(AVFormatContext *s, const AVStream *st, int ff_copy_whiteblacklists(AVFormatContext *dst, const AVFormatContext *src) { +#define OFF(field) offsetof(AVFormatContext, field) + static const unsigned offsets[] = { + OFF(codec_whitelist), OFF(format_whitelist), + OFF(protocol_whitelist), OFF(protocol_blacklist), + }; +#undef OFF av_assert0(!dst->codec_whitelist && !dst->format_whitelist && !dst->protocol_whitelist && !dst->protocol_blacklist); - dst-> codec_whitelist = av_strdup(src->codec_whitelist); - dst->format_whitelist = av_strdup(src->format_whitelist); - dst->protocol_whitelist = av_strdup(src->protocol_whitelist); - dst->protocol_blacklist = av_strdup(src->protocol_blacklist); - if ( (src-> codec_whitelist && !dst-> codec_whitelist) - || (src-> format_whitelist && !dst-> format_whitelist) - || (src->protocol_whitelist && !dst->protocol_whitelist) - || (src->protocol_blacklist && !dst->protocol_blacklist)) { - av_log(dst, AV_LOG_ERROR, "Failed to duplicate black/whitelist\n"); - return AVERROR(ENOMEM); + for (unsigned i = 0; i < FF_ARRAY_ELEMS(offsets); i++) { + const char *src_str = *(char *const*)((const char*)src + offsets[i]); + + if (src_str) { + char *dst_str = av_strdup(src_str); + if (!dst_str) { + av_log(dst, AV_LOG_ERROR, "Failed to duplicate black/whitelist\n"); + return AVERROR(ENOMEM); + } + + *(char **)((char*)dst + offsets[i]) = dst_str; + } } return 0; } From patchwork Sat Feb 3 19:33:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 45998 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a28:b0:199:de12:6fa6 with SMTP id cj40csp1707756pzb; Sat, 3 Feb 2024 11:31:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IEEH9uHJepevS9DPpg8XI3ByjztDmwmH7uItWPtaI3/SJBzGF4yt2aZ2LuR1KRbidUYbD67 X-Received: by 2002:a05:6402:888:b0:55f:f2ae:20ed with SMTP id e8-20020a056402088800b0055ff2ae20edmr2096965edy.16.1706988715441; Sat, 03 Feb 2024 11:31:55 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXrfvlA6hkWN0C7szHIcFwFX7TPjuhW8afyJMDj/YpTMM6o/CxCzKWoJwHkkXvOSF+PgL0KxvCyzMUHa+ivVMDuXhVluhfttkyKNbRoVo/5y+0btlyh+S4FegYkMtK0KT3t/UOjmJ5wlpzIKt2fU9amPculnRVbSRyJ/qPlmK4KvasJF6j0u68tiOZBEVo+efMSmuSmoXzjXLfYUH2oT9BudKcJiFR+g7yodR9vuOw9gFeZON5NaxdhH5r7gD1OZMqrZ3JCvZ+LLYDB5oACSC9LgCUi3nwBLBMflhSpSU/y1/j6BguhU4gnHzbvFZBvcxBmCWBkhVpLrjCN/0W55hN3xF82w0toNc2MptnPXARRRokFRWLBB6UbEy7N+gawPmdG75KKZ0BCU4lHo0hxw5iSA0jx/ElzD5+ND1tiabykOPApzGYsNHuP+fl0U5EYfg5AYrDnUDBCnX4MAU/rJRyfyYT6ee/ck8wj2kT15JMZkmjs0ulSqAZk/REikGKWyqnlVyI+Y5nHCidC2FavrUtQr/U7J46wuP3gRGibA7bXCDG+jOpxS0Q/Sc7qiYAIqzfkoNRDGmEuolpe+wRPVL3wg8IXi3WOhDTf9D9trYa3T3Iifzv1F/T9iIKHp6pLPxpt1AyuciCisGtebd9ZLNJNLSk22WU5LpbxZ3eC0T9cYNSN7hTXCjJAjJQS7cS4Tioo48AJowllq3We2qT42N8CFeiA7eiHoUo1/h+981c6DNH8xvGU0Xt3u+h0jpNnVARJz4FrrJQU1vR4gw2tHwdiie2ruu6USJu+Ifmxna16/6qf9UPxKOcp6yYxIfYM3WQN2NAFF+x6lzD/fbSfKKO0TyD4hcijCI4DnbH9NvsHyREGgyzGHya+cprHXMo8m7yBf/kqBUVIxOotxuzi/QoO67/Bpm0krYr9i+Dz49f1M3DCBrNA6zOwgZBsBJdf4A/pPh EvjE9GceOB4wxBYBf/6u2A97tlsmq5DsL4yETROnwUWGE3VupudNyIjcynBHxn5W0DYwsHyJKk4Vv1KI3MQga7OE6yZr0diBzM8+i+Cs2e79dNuh/CXUbHz87mWWBsu+N+gJd+4yaBmYEldANRGf184sRokHHxv5eh4gDxIl7opCYbCVIR+HaDMxVni4/f/Rd/Qsccm3KvYaOLxoXzXw9leOZ/OWAd21aMvoHg43La0RGCUP0XkjreuN6wFaEjdbbM335jxY5PbLEti3x8hMVC4tEqj3pUisICYrMGTgJfDblw4gHHv9/rXOitJixCp4kJ+Kato/h9gtRcQgrsaxxQbWrvAS09gt7hxqymBRfYFAIZfyLRKSjG0wb2dU/NPxPx/HpUR2qlLB3gev8rRxMG5SdoS0/Sb0jKwhyHmC7c6niaOMQuFSp8t3VVzieOAIGM2nRaLCNvslMRXoxBBzC35pBYr3jeY9/K8wSHwVtJ2ALGfnyoyt7craDVhQSdB860J8NMaua8bskOGsQrZs+MvR5j72gO/xwpuT8M2Ms7qNuzM5vFITesCi/1etgwMtuKg44jS3ryYgK0DqgLaEfokaBuweduGwSAAq6CgIa7 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id eb10-20020a0564020d0a00b0055f0fa7d404si2187168edb.218.2024.02.03.11.31.55; Sat, 03 Feb 2024 11:31:55 -0800 (PST) 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=HRfwxNDh; 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 6827A68D12E; Sat, 3 Feb 2024 21:31:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2012.outbound.protection.outlook.com [40.92.59.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C04F368BC30 for ; Sat, 3 Feb 2024 21:31:46 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jaU8D12RRajBARlQvy21pkzSpYG3Snrmicw6/zWHKELPQrzZnsCaguX+sTICV8d2dhYf6rwfmQYtw2TKQSFDSFE69SiNxiXnv0ixNd1P0NHpvzbLwiJiBfwWPltbBrvnknP7Ey5d4QU/uNeNAHrCU2lxH0v/9tNwrMe29TnF87Wj4rE6Kn+NmhhchqpDMOK2+MMmC2ZOzQwEyhFwFZ2pK41tTv1UpYMPdoQnGw7krskRSQVWZfTKsZtXficFp7vxPHx+W8TJc/RwYvV5yP+utdQux4RnSMIMI39yamKODNZfjfrMXM/aYCcBYycK28fzFDlnJ1N7EmjJYgPy6o6+aA== 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=307H/R2fKK7W+dNag003NjtiEIFuSHcqQ/Ik1+Nu+Gk=; b=biejYMu5lNIsw83aeoBc78MhStIeKqsJopo7GuJA47ItI4ZinLCec5BJGjRjjeVBjt8j71aFHdCxKRGmu+b/PJO3FSJbkyYEX3MXgtlq196vay9KqUrnIl2tvGd1lI/q71Aqfl3t3eQlnBPRVmaFxiJPsfEbR/dxuH7aO/z+Vqana+YTeuzhE2bR1jkJsTOLy83ANhbv29Qfc21p+2g5m+LiHnQHHhr4D4RIddg5cXymkWWIMY8pka41z711DvgcYFSnabHWFT8Qjvr1zl2j4AYMz2StPqGG0j8CsP/ks5HI9izHnXuxxrozJBYJJkbaR+OMjGeSlSB8hlw62UdaTQ== 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=307H/R2fKK7W+dNag003NjtiEIFuSHcqQ/Ik1+Nu+Gk=; b=HRfwxNDhm4QoNeG/NbX52VmvjC7zdiWn3NELC5ix/6acFOSys1pKCArOuKhh9uEtxewnyKmGrvHTObEh1BAkh1T3Lun0Zegh+QNuDzbhLzkqbhMwJ18bI0VhsFRgSo+6gsMm+J4+3sgINNdp7iuY0h+rNM9aX++SgYKZPDYApE5cLYp9WA+1f5gqeXdxe058GqiYi1jMNcjn6x+gWUfbt4Sx52nG0z8sUEVrnD7rXklAF5nDj2x2otkpXeHXF0Ma7/BxQtNmQRvMUdC/Dm47phPWlmA180eoXGZ2ibcVvbnJJjSNoazCRerJA+8Y3xf1bkfUlc8malq5gCrjfCcnzg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0305.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.31; Sat, 3 Feb 2024 19:31:45 +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.7202.031; Sat, 3 Feb 2024 19:31:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Feb 2024 20:33:30 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [HrnaRsMvGVmsApdZqdpnVpTC8ngQnAzvV8L53e/cm1Q=] X-ClientProxiedBy: ZR0P278CA0146.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::7) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240203193330.2254723-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0305:EE_ X-MS-Office365-Filtering-Correlation-Id: a3be96b7-1580-4d62-694f-08dc24eec1a6 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UoTsGgjGBfGlVvze8iimPqBv+KTnYKeauPz/o09iU4pKwtBeAOmbyFO7ladwfF1Fcer4YkmsMG2RoHHUS+IsQjPhd+M9O0Bn5iERQZhMywAICzVMagencJ88r/OfYNP1F/PGpcAJsa6WNghs4pjfV6Gag9tSwurgdXjSJjjRBKUTOVB2C1biKNsYhK1qVYyE9xUcsoxW+ybPFII3EEYt+OahFjgY+MPkD1T2y/oRejIgblt5fC9XlS9ixFaMoJXr/YLi+xFE3pSmDyeTRdKnWPwFR+HhxSoEV3Q0IW/R6gfTwP69Eyh0SCxiwMBE0NuXdn+ykz3iDkDcf2za+ZP1BQGMl4PQg7rrkhuqu/eHcNI4LEFpBqVI3KSBFMBq/SUNF6j8Z3omP/cRXrRQMyofV+pyqBjLutQPwFbu1c4JRai7iF17n64gG3nwA5aCFjKV9Tlt0I8ZlNq1UAtvTZIjSEKpeK5peLbTwPHgiKQXlrMeOrrGFwvxkD96FGyaCg2cfIA4WMA6dbeqIktrDfcD3TzEq4JM92aZVsnoPiwYBp+cm941+A15sZIhMeFNdIinRBJF0DnP3YcEs2mcwNrBgUkttOVF/MDgZZ+yoZyltB31x4HaKCezWNuSu9wMJZP4 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0231Cz4ZIckD+YxN/UCYpxbXQ3Ti74+k+wK0JfI+5e/TN9x0S6WZgXg+g5zcCjSGBzX49J9LPHEsu3lbFyVa8wOTmkw8ng7ED+kzq3MakKoly3Wgns4kjqFBnySHNS39XyHi/pU5TF/YxppbWdcTBgFTxzuPlEKakEICQzLYuWV36G0oouKqXCSGccLb5ZPoqpF07ZQdjXPYKnHwp/Cu4h8g/kf33P/zdAzE+gx8BBv8ZwLLPSdbkKFJSfZH1dDrA1cUUngVAu2g1zqjvOBPKv35uN5XRoB4yecviSNsYocfhIHYQMFnDM8e6v9OUKBFxY/jk2HshrZb76dAOc7chGmGV+9MvrrrBY69o3Bb/RKKE7AT5+UrMSxc86dXfXGftqWmTSQAV9d5veKqQA4QXzcMs8HxhlZ0vcuBBTMX8vFo31uEEtvwvZxsw7NtvH59XeUXAYEzRKGp1P7wYraA4K+gwrqQh1Ksrw6NlLK4aqUVwiA1MzqL2XPVpb85vU9EvfZ6ltlBRV2x1xPCxsDGz29Agikj02HQrCmPd9RV16onk3FdiYppnEDP271Ngb5WJr2lMM6Shzck89j/inncF9kBAvKUfqn7kiZtSqKB60J64xiF75VykEF16Phbl/rv62QIhuoK3GyXnduvUdzHWsyV1KT3c3HX6l4CcQXxQiBQW+E4+43tFhJv2v+1FyQdCBX5RfZpn3vSZjugmryV2TxGOtSONyFDat/feGmv1L8g56+LIkq434DI7uQOzo23zKXZwRPBExrSPFC95hrVEKrim248E/ozPC2580hN0LdDGxDqhs/KC5KhC1zIcNwJPyz9rpMJ2lg9/rTpt+sSQzTqpcKsYvVeRhOKGX27dAVfYIuWBvItXGZ8Yk8ujEqmIY6L7xKnNa/t+WtBeK+q/ufWvyvPKZYL1guSVSn6WMZxH8eswtXB3m2bgXYWPLPQET5EzywqhxQD4jaITTEYEut0uMl/MF1inz9DsyxV5wLNOFasFmk73BbVkmCaZOqliiAiX6WlAXTucDRP8aTnE0zEG49K2hTS6WWhEV6BYXDQ5jRPEQEuHO0DDC0v4xrHqFljAWCbYN9KBbS74VwfODfbWn9eifjbaWSjzBwdRBD9wBGPDQv/N9unZEzK14mD9Rc3vqjSU+SNWA0t5RVtCbs5ungqQcWUBqT3m4WUwScCsCoq9DkfFPQsZERcs8HZQZk1BZSflSAwNmV9WjDLxW1uYBfxf6s/YkBKoFQKtsgZaO1mRo4MC5wLXPHLBC/y X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a3be96b7-1580-4d62-694f-08dc24eec1a6 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Feb 2024 19:31:45.1154 (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: PR3P250MB0305 Subject: [FFmpeg-devel] [PATCH 5/5] avformat/mux: Don't allocate priv_pts separately 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: A3GKzLEWZnY8 Signed-off-by: Andreas Rheinhardt --- libavformat/avformat.c | 1 - libavformat/internal.h | 2 +- libavformat/mux.c | 17 ++++++----------- libavformat/mux_utils.c | 5 +---- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/libavformat/avformat.c b/libavformat/avformat.c index ae79ee6ef7..ca31d3dc56 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -63,7 +63,6 @@ FF_ENABLE_DEPRECATION_WARNINGS av_parser_close(sti->parser); avcodec_free_context(&sti->avctx); av_bsf_free(&sti->bsfc); - av_freep(&sti->priv_pts); av_freep(&sti->index_entries); av_freep(&sti->probe_data.buf); diff --git a/libavformat/internal.h b/libavformat/internal.h index 520f1a5229..c66f959e9f 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -245,7 +245,7 @@ typedef struct FFStream { int is_intra_only; - FFFrac *priv_pts; + FFFrac priv_pts; /** * Stream information used internally by avformat_find_stream_info() diff --git a/libavformat/mux.c b/libavformat/mux.c index de10d2c008..93280f9047 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -406,16 +406,11 @@ static int init_pts(AVFormatContext *s) break; } - if (!sti->priv_pts) - sti->priv_pts = av_mallocz(sizeof(*sti->priv_pts)); - if (!sti->priv_pts) - return AVERROR(ENOMEM); - if (den != AV_NOPTS_VALUE) { if (den <= 0) return AVERROR_INVALIDDATA; - frac_init(sti->priv_pts, 0, 0, den); + frac_init(&sti->priv_pts, 0, 0, den); } } @@ -550,7 +545,7 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * } pkt->dts = // pkt->pts= st->cur_dts; - pkt->pts = sti->priv_pts->val; + pkt->pts = sti->priv_pts.val; } //calculate dts from pts @@ -587,7 +582,7 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * av_ts2str(pkt->pts), av_ts2str(pkt->dts)); sti->cur_dts = pkt->dts; - sti->priv_pts->val = pkt->dts; + sti->priv_pts.val = pkt->dts; /* update pts */ switch (st->codecpar->codec_type) { @@ -599,12 +594,12 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * /* HACK/FIXME, we skip the initial 0 size packets as they are most * likely equal to the encoder delay, but it would be better if we * had the real timestamps from the encoder */ - if (frame_size >= 0 && (pkt->size || sti->priv_pts->num != sti->priv_pts->den >> 1 || sti->priv_pts->val)) { - frac_add(sti->priv_pts, (int64_t)st->time_base.den * frame_size); + if (frame_size >= 0 && (pkt->size || sti->priv_pts.num != sti->priv_pts.den >> 1 || sti->priv_pts.val)) { + frac_add(&sti->priv_pts, (int64_t)st->time_base.den * frame_size); } break; case AVMEDIA_TYPE_VIDEO: - frac_add(sti->priv_pts, (int64_t)st->time_base.den * st->time_base.num); + frac_add(&sti->priv_pts, (int64_t)st->time_base.den * st->time_base.num); break; } return 0; diff --git a/libavformat/mux_utils.c b/libavformat/mux_utils.c index 3e63b8039a..c7ac2a9c97 100644 --- a/libavformat/mux_utils.c +++ b/libavformat/mux_utils.c @@ -33,10 +33,7 @@ #if FF_API_GET_END_PTS int64_t av_stream_get_end_pts(const AVStream *st) { - if (cffstream(st)->priv_pts) { - return cffstream(st)->priv_pts->val; - } else - return AV_NOPTS_VALUE; + return cffstream(st)->priv_pts.val; } #endif