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 BB8C5483EB for ; Sat, 2 Mar 2024 15:41:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 30A0C68D105; Sat, 2 Mar 2024 17:41:42 +0200 (EET) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2093.outbound.protection.outlook.com [40.92.91.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E699368C830 for ; Sat, 2 Mar 2024 17:41:35 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n+/m1eyn9wj4j4t/BFvBEYW7FwDO6dMA1ER5hS1W2Tnfj/Am/z6U/2LqhNtn1ZTys2NT0MlgGnKRscwaN5qewvZN7gpgAqY1JMDESHmgT80DHpYX3srLWmy7l49G6F3Wxx90m7hP2VtNOYexEDIFbzY9E69ymc/9RBI0NobcRWLFbvihL7uhJXTGks14REkZ3PVYS4LjnnzC0Wal6wOx0SBSaI8p+WaEBTKlJMxlqKkCSvIYIH1ZJ1vR6Cihv5qeJXus9jvrwdDbucSby9DWaXbfzOR5KVZK8ZxPmNGMe+JvzxvgMuCYF9gilf5nF7g5X1iX9IoFKjmbRf/sZB0ABQ== 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=2Oyavk6P/xDKjD1CFi3MNTVbEvhvBSIsQVs0j6EnKKg=; b=VU239V0CQP39PtrhSmLVFyZJTmCTcFqPNU5nn0GEfeOsFRn0tp9AsPFPJgLsRF5OEk7g9Fzu39YWSTc4x0WichhVJAuw10+A8x0Sd8n96rNZvTwMhnKBluzNJeD+bXXKmqdg6MdiSHkkOXViHVAKpe8G2qVlEWMpfqIlCAvKDq+TD+mK29U7g6d5RQNMusiQ/deDZTHU7UtzLmhdePtQc+4IOXAcS9aUbdNNSQW5Rf/cd2jM7t5NouBCz/I7AYEA6o8DLG7gSYHhEDGy6sbSyGS7AaxB/kE9SB/uPpHdqwCAOc95hDWB1hkwN6uZr0Jsh4yss7iJoa79QDT+0AxJTw== 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=2Oyavk6P/xDKjD1CFi3MNTVbEvhvBSIsQVs0j6EnKKg=; b=MJtlp0Z14aWlSxR1iySnMWRaNDtZv5w+U//qEhumJHB4UKOV8Ah26pHq97mtHSHr4gT7XeXNTwD7dJnRuiAZGbiyW8V1h+bYfgQccB6iID3D2t9ltRqFHg4QrOWMsPS8/AAJjdCyaDw6hgcFxUK/o9RI6BFlSrdbN2I7ZYvMmTdW6rQAuJo5ffF9XAuFcMl+5lPjVisCEMZ4wqjiTy8l0TwJNKTVYYd2BY0yoNu3apxPz37LHdLuc7/ItkpD7gRiYwLj4OF3zhnfwd4XaQ27ALNP9lOXEAQQaWQ0qMJJoo1MbjC4Bnpx2REcB/yaN2vUwHlcAgwDTr9W08cRZxHB4w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0293.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:328::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.34; Sat, 2 Mar 2024 15:41:34 +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.7316.023; Sat, 2 Mar 2024 15:41:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Mar 2024 16:43:25 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [9h6jLv3bnPLKCkW7BUgnlb+JSxspUYcBuHOrXp6qHFk=] X-ClientProxiedBy: FR5P281CA0001.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f2::15) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240302154327.4047954-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0293:EE_ X-MS-Office365-Filtering-Correlation-Id: d093a621-5f5a-4105-badc-08dc3acf3d73 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnp1Zl+T4aq3XJ6trwEamTGXBiiFjwfVTV7WGIoLAVGp9Zr2WsLiwWaUGuFbXG2fVk7z4uj04Y36c2yhpy1rFKxDOmcmdlF9XXDMlJxiOMrhdta1hQuyrS1TtpqyoLRcYPnlrWdFjelwlF+5T6fOc0L6VoF68N0gONa0VF0mfWwXRhAtm4HOtlhquatKyTzIdlseTK0I5/euOMal2utJqMY0Hy+ueJVXy6S1ADDzdsKCr+X+Tgo7FyH/BjOS1lHq6R3SaEySPUDeLEjRe0eFouP78fUzVOIugdG3V6JJZvci6n9qtDVRoJOZe8RX8aOjkrCuKduT5W3AMqVxSZdHc49cVGZaBuaJ4enxQ7rZ6aMieLMda1O019iuNU3DmZ+7O8vmiokAP/NCV2Ne7fBqcaJIKv3N1yrfGAqCOnN3vkFYwabGe9icGqD3WzQNNJdS2XlM03Weq+ra+6sCjwtNNiExNxc5Fv9V1m8Kjw4iLAsPqxrk6B0gMFQM6zUwAU0iy4nGKkoU+jHQkLWaetQrnV5T8wOnnC5zs/S3jSA5ZZHOR/6o8qE9BMhmWuo0i3VfhmOfVIpU5sPoLZE33tXKFUkfotd/T07RK38nDI1Rf+xlsmSM4Uaw0DAecX4FhptkAjjcac29PPftr3vDvx88hSdpwBM2tzahQ4NU5YGj7kgwL8XQKMbVq4EYkjJ99xdN81uTJ5RL8zH68w90VV9GPSfODNJKFLym0ULYWHbAzDSb674sXvRu+zzWqGgiK5ooQrc= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mSRWrtBpCNfXvzd2H+uv900i3z7CRCuupIcvyY4MoKz0dYLZpz2V/KVuSIErp6qq2FaazkBgLtjyk9ZnZ3cnE2GhTDpIpzfaIoDFBpTx58TG8P1LboOKCjhXVwujYocsHGQ0FJq44lBYUukL4qQ6hLmpNzbQeobv6+u9hyrtXvfB5oPVUi/mNNlObqjAIYD1RZjhYIShBzqA1Gqz09z07gTUwr2uVg2guPtQGYpFCaY5+FGpYT92y8ybHfX9Nd8lKXZn1D1brytYB7hhipoxpqBV/qtRUba19MhslE0ep79rjEGxTftNcR1liqLq5Q8WY5we2ank9TXG83NkhTWIZJDt5ojk/HdRLrPlh2tGFEhC5FgWfHNt/da226B+mA/GO5XrCFbfTS88uFGH8hufGDwzaF96sagKB2L0YZ9QL20/1gv0VgqjdEm/l5PRUbffrlrh/DBAWlbk37qnrLXe2tFOPFnbKcvzDBBXcugIvE7eyIXVLMWSsJu62dc4tS5BAEe/DFnm4Wt2lIcDbZGPUJwc5UyfmrWQQuTttJy+83p3Cq2gS41szepWeKPRtipSKqC76AXOb8nDx44Oc0rEP2g8QDNJT6w1+/9+K84dKaY/iEnNgUiKJcZZ0ZWjdHM9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?E7MXxk2ZqnX4jXsHEZjbQPQaSyg5Nir90Xn0iXsaespbpa68g8KgGhrIeAl9?= =?us-ascii?Q?7SgiDjHytGemm51cBf4wesuaLSWl/yur36seRMpnPiFLlFk5vxvvwdpLkaI9?= =?us-ascii?Q?s0lxmh/5fSFUvD7nmH6beitJvflv+huh8RX5utP193/b6Af6E9YP4VLIgGfU?= =?us-ascii?Q?mg41taq6hOfwBsval0ARQuFD/3b0+3Uzy/VKe3LYgDyin8o6vjFEOzq0Nlxn?= =?us-ascii?Q?zrSXNJcHCLPJtHHws718Xx7muR5K0mWbxdJ9jZejrPtNjFu/ApgSHCAN/2pK?= =?us-ascii?Q?p4mqxBxMRNJP3yBR3Oa8iWDdyssVX8WV5ndCZBGYGipgJcOX+BDMIOwOOic1?= =?us-ascii?Q?IDDG1mBTDbeK236SJuPtGvQh9ehpYA3x+MaTBplOlp9cwkiBqklPLlAIpkEE?= =?us-ascii?Q?2jRFkA8TT/tDvp9FE4cUSCQSvJpQbifEaJGSpPXjwa3J6vj1lKbVez3TyzvV?= =?us-ascii?Q?PIJgI66R1YgLeVRb4FREwZgI+jJ86sNLRQJdoNoo89ROvWdIvjRZrbqdrIXU?= =?us-ascii?Q?ZMOdwl1YENxBggFakyc/cAOFugf9wIoqTFFwKcPOE4B9IU0786DPJunbPJsP?= =?us-ascii?Q?MtEWnmFhzNBAOXJaCcmfefM/ms0nBTPPoiDoSp2CIM9QV5uCdIbLvFM3B59K?= =?us-ascii?Q?WQpKk2+d8jJ4CLLr/AmvT79iwql7pr8y3sVeZHXLZHH71Ya9d+ulOqutHiwN?= =?us-ascii?Q?O2K3fwt2SXlmdNbIKxBtnCUCTUYsTdlRM4xup54+e/uDxVSCAMBRoLfhH6KZ?= =?us-ascii?Q?P5/XuuSC6eSsaKSsXP9wAXRqFP0LbPokmZzINLJ7bgCV+jDrhIEuRmKLAgnZ?= =?us-ascii?Q?sXDYP3JGLQ716XPmiVRexUPJRRo7gOpc3lMVLv+HyN/QXPgw/Vu921dYDzyV?= =?us-ascii?Q?DFAL3Dgh0jFy0ifwzqo3Ntm4cSCmcLimTylWuES0NvSa4ZK2UFhPYoUOiL45?= =?us-ascii?Q?1zhOM+REqAtqCdVc4RNrAuWKHgvAZYto81avUlw63ofh/cJ7FmCGuddYHFgA?= =?us-ascii?Q?s2jBIv9vJlUadvxbvMSFzWbwfNR17OxEf0ipSWIVC8VS65wc8b37S+5jMnwW?= =?us-ascii?Q?neIHgKsQm2lQ9bY+WoewQZ7/2ln+JDlv9MZRctpq1xmjDu2Hi+FVmBL/0jbN?= =?us-ascii?Q?HDJtMpx0YyOOZBj8svsj4M+maaGxsWVF20xF8Xog0fveTXjIMWMezM9uIJGH?= =?us-ascii?Q?qqtFpB2iva23MYSSqjjOBZX6IHsSql804qsejRKPyY0ll12tfZXQBV37LZSz?= =?us-ascii?Q?OrrFfGbV3p2x80Aq0p2l1rWe93Q15uL5pyX0CBlUwg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d093a621-5f5a-4105-badc-08dc3acf3d73 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2024 15:41:34.5063 (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: AM8P250MB0293 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/dvdvideodec: Don't store AVInputFormat* 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 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: The inner AVInputFormat* of the inner mpegps-demuxer is only used once (in avformat_open_input()), so don't even store it. In fact, just use ff_mpegps_demuxer directly, as this demuxer has a configure dependency on it. Signed-off-by: Andreas Rheinhardt --- libavformat/dvdvideodec.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavformat/dvdvideodec.c b/libavformat/dvdvideodec.c index fd1f640560..ef2d4e6df4 100644 --- a/libavformat/dvdvideodec.c +++ b/libavformat/dvdvideodec.c @@ -136,7 +136,6 @@ typedef struct DVDVideoDemuxContext { int opt_trim; /* trim padding cells at beginning */ /* subdemux */ - const AVInputFormat *mpeg_fmt; /* inner MPEG-PS (VOB) demuxer */ AVFormatContext *mpeg_ctx; /* context for inner demuxer */ uint8_t *mpeg_buf; /* buffer for inner demuxer */ FFIOContext mpeg_pb; /* buffer context for inner demuxer */ @@ -1210,12 +1209,9 @@ static void dvdvideo_subdemux_close(AVFormatContext *s) static int dvdvideo_subdemux_open(AVFormatContext *s) { DVDVideoDemuxContext *c = s->priv_data; - + extern const AVInputFormat ff_mpegps_demuxer; int ret = 0; - if (!(c->mpeg_fmt = av_find_input_format("mpeg"))) - return AVERROR_DEMUXER_NOT_FOUND; - if (!(c->mpeg_ctx = avformat_alloc_context())) return AVERROR(ENOMEM); @@ -1246,7 +1242,7 @@ static int dvdvideo_subdemux_open(AVFormatContext *s) c->mpeg_ctx->correct_ts_overflow = 0; c->mpeg_ctx->io_open = NULL; - return avformat_open_input(&c->mpeg_ctx, "", c->mpeg_fmt, NULL); + return avformat_open_input(&c->mpeg_ctx, "", &ff_mpegps_demuxer, NULL); } static int dvdvideo_read_header(AVFormatContext *s) -- 2.40.1 _______________________________________________ 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".