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 B1F7843B51 for ; Mon, 15 Aug 2022 04:39:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0C78168B903; Mon, 15 Aug 2022 07:39:34 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2035.outbound.protection.outlook.com [40.92.91.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E00468B485 for ; Mon, 15 Aug 2022 07:39:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e+58VQ4Rx+ojE0R/QzknPLPfpYhhjOfTeZ3LQp6oJYlio5nKAPkLBSXdHU5TIEEADLpRSxT9OIhTAcHaVJ7xZ1vLiy2VKMIh8pdsbfLaLhk3HQE9JfVVR58tsr2l6JRB+KBD/5TBtADf1baQKWm7zS0r1yWgIjrO1x0i+fLxSRK5UTTyPKJ1d8BlHF7xD2sJMG46IldeejyNfWFZ5lwFCXWw/hNzMAPlpezxK16vSi75X5JwZ3VFZ6eYAkSn5SjRzZV+115qKd/ubKCEkDzSWWdAXRlhndQf/Hn/+B0FzAjYvUV64cDYTDPejsgKC/Ps9Sgbp+dUYtL6RVBWT509yQ== 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=RoWAcI7D9hnvLZY9b6Tcu2a6P7QFI1V+vn2k8ygu/+g=; b=OWmNEttH84ChEjdpoBlfb2Zm7s14relXx9/GSG6SvGjJ2VbEOPd1h1ItFMjGRUhiJUBI0wAocKVQQsvs7ovjRKsO3QuykoyRZKKF1y+HvwyIC0EFsLDfxxjfwzrW+0Pabz+79KEFnjnZPy5Tg9LvfvQrTqikPkOXCwmKAPbBNbNg3BrdL1kdoGJgGJBJOvVTO8O+ozJVhqS1pQGqvtILDMXG2i+00t+Tt7Bc0WjBROEGcHsaUnxA7HohcXTeGoSP/plYAQYVQRgajMTBAgWRdUeyE0+i+dbD7RQvriRKdVX23D+a/CgHvMDqxkvsRSvjRxUYbwmEKSkyTAGtUFlbuQ== 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=RoWAcI7D9hnvLZY9b6Tcu2a6P7QFI1V+vn2k8ygu/+g=; b=YisnUAzbrgN1spSxFuzeFMDCmnBBP0ymdeLOdMMWFxH1T6ALIlFx2pjJDlI+abctnuE3J6/M+xn57ytI62E16g2QmjMyL/smTXgWd/pJAR0qptrHQBaLQ6ZB0bA1PT5Wq63JzhVJRBoBjkPjwFfftMCcOmlOfx4TW21e1UW9EMuzJ2b67jlIPs/j4gPy0Hp6y6m/hqqUTrl9YhjV98FZsYiN9IqFxFZGiqsFoGuvVXHz/uwwO65TiFp95IPrJY88GHICeL8t8AqdcHVdZDdjz3u8gwWZmv7AxT3SgA9X2kO5rbbcEouvmSvi8qGTF8xs3WGXEBDZWapUigf7lUv7oQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM6PR01MB5173.eurprd01.prod.exchangelabs.com (2603:10a6:20b:98::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.11; Mon, 15 Aug 2022 04:39:25 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.027; Mon, 15 Aug 2022 04:39:25 +0000 Message-ID: Date: Mon, 15 Aug 2022 06:39:23 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [S/KHZlLa7rnK9ZNjJvYwrPvskBAls1SS] X-ClientProxiedBy: ZR0P278CA0140.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:40::19) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <215707fc-ac01-9a59-2e8f-f57c3b4bb04d@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: af593759-c767-41ca-00db-08da7e782170 X-MS-TrafficTypeDiagnostic: AM6PR01MB5173:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: huo7vcl4X8cc9fYOJ/pmG73Bw9WWm5HregGZDkAoUwo6Ok6bH0IbFoJh0JevfckxLMb+CdB3fXF3s4w/ujVBAfnccdhTKUMxb1YYMeo3n1ITHjjeHGegp6BtopfVRnWXXuoC/ZDRW03JvECJG5yGHfRBXfZPWcdRqtkEQGw/0Z0rMv5ZekyUG/+m9OeaVsLRpsYhwVo0cL6aLb0BmbOS7HG5HHidlT9qiM2jdQqu+KsSgiNr32N/eTwwwB3qpNJYpEuDakMosdH43ll3l3/cILkaaiohYwqxM2QNLt8vRM25Zlo9oTCdABuimD6kbHcOULesT/KSGO0FDM2ydlJTL9xc03u8P3jgj51n9Dy15//qNxVraG2ZKp4VBd0aZcqcOKWtQGLkfFCCDiBdVfMFCfyiv//hu0zd5TswQnmrfQiDqINyFs9ItXkN1toy6wHdT2Zgs2e3tPOVP9h/R2BC8gbfI8posa3LwPqOWwGYWZ/c2rrkWnJkdLkK1umxfzn+u3jv3t6XnqzE9xGZdCNz2Coxjci4mUKp0WwUxdkT97AEFxDUzeUitWJtB1/2ZL/xcV9B7ibZWdvTAd0h58+j68iUnENfhA7sv1Ir+lHcqw6QvyC7/3eTkIoP4YqpHTECm5I11geVoS1mNS/hu/V/Bkvrw5ivdRIEDdmErJLvTl5JGX7RmjfcG3MIAKNz02sm X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?R3dnd1lYdDAxRzZ3aVlxdG9tMkxjSmJkSEN0eUZjV0tqZklFalJTTFk1clJU?= =?utf-8?B?Wlc3TzdUZ1VTaXBVUGpwZFh0SEMyeWkrWEVIa2JjaUM2dzhlY29WUGFEQUhZ?= =?utf-8?B?SWxXd1poMy9hbWJxYmR6OFZEZVdGTlQ3UllSeUFHbnNPZTFzdjI5MWVFM0I4?= =?utf-8?B?YW1QbWlUN3JWd2d0K25zYklDb0J3UWxzL1Q0MTZuZkVtWVEwZlUvMHVJVW5x?= =?utf-8?B?TVR2MFJ3Zk1mTmp6ekdxM1RPUENTenpuc28zTEdNSnlLbTRUUFVBVGVOVlI4?= =?utf-8?B?YlMwUE1SeWlZOTd6MXBTYTRrSFI4czB3S240ZUllcEF2WkxPdms1UXFCVXNG?= =?utf-8?B?ZFBLVkRMeUlaSFdISlQ4czRyRTk1dUYvb0NYS2lKd0d1YVJaTzRnR2dwRFBP?= =?utf-8?B?Sm5KQ1ZzVlNWNER1andqVGdRVjlKS3NFQ01oTm1iUVFXbUNDZzlSSW9UTHRS?= =?utf-8?B?NmdPU1RRZWpSQUpveGk3WVZIalAzbGp1eDVCWWFIeEwvNURMRVhlODh2dFRo?= =?utf-8?B?czl5aFYzK0VqamFUY2dhMkNJZ0JQSXVGZmkrdVBYQXUyaXFqakU4VjZETEMw?= =?utf-8?B?RDVicWVLaXBwUy9HNUJlUEFwY2VqQXM2c01acTVZcDQ1RU9DQlNMU0I3UnBv?= =?utf-8?B?MWU1SnIyMnhGZ1dRM3gvNHpoZThqYTRaVVRtTDRPS0tqR1dyajc2L3EzS3FZ?= =?utf-8?B?ZU1mVW5OWXFNalA4RTZhdDE2aWNLbURCV3JuMVB2VEtJQm5IMlN3TlBLZWRE?= =?utf-8?B?bHNROHpOUVp4NmFZZ0xrY3Mxc1B1dTdEVEpNV0hPMmlrYzl1UkRGbW84QktH?= =?utf-8?B?dENEUnIwZXJFM1l5RnVOMVZBWi9zbm9NR0IyUHRCMmcyV1V5ckZBVVFpcko0?= =?utf-8?B?cDdMZEk2SzFFeklJaXYrRnpQUE42dTVqVUt3WXEvSHJwYVlDR2VaNldlTTk3?= =?utf-8?B?WTV4KzRoeFdQNVpodVNzOUxPWkdLWmZIR0hRVjQ1RHlucHdiWGRlMjE1dDRN?= =?utf-8?B?Y2pPMUFMVUlvWnUxeGNFWlhzVFlXaGZzdVVZaFV2Wm5ISHhkdlQ0aCs1cnN3?= =?utf-8?B?Y21USHNiWDlId1NucXJLbnFIenlNUHJxY0RTNzQ3RHRQcEgzdVpXTVdNd1dw?= =?utf-8?B?VWdSaFE2RXEydkZDbG85MjNVSm5hVlV1RTVVOTcxNGlKeTRGM1RwYkFtdlFs?= =?utf-8?B?cEtRT3lxZGxEWDkzZ1AwZkZxOFYzV2lpUWpBazVLOGpWd25RUnBiRzRhNzRp?= =?utf-8?B?SGtnVlhUSlJiaUM5VWRsZUNFR0NnUzduKzNPSFNzcnd6bXFHUFV5M1d0ZnVQ?= =?utf-8?B?Qm4vOVRWK2NvSUh6b0xjM0R5VzlKMGJPRUVwQUhPcWhkcVlSR2ZpbEkrSkxL?= =?utf-8?B?MlptOTBrbDBYVERkSUFnd3NUdllWditMWEhPWlF3cVRRQmNwcEQzSnEvWEZa?= =?utf-8?B?UFpYeHFNamJNSU1Fdnh4bGk4LzhyQitZSTFDOGxFZWFsN25jMkNLK1V2U0E0?= =?utf-8?B?d0RvNkhTbTRlcFZJN1l1V1V0QUluN04vSGltc1FqRytKVzZoOXl0K0l3Tklz?= =?utf-8?B?T2VZRjF5d1Y1eVVuZzRFNkZaU3hxUGJwOERjV2pPY1orblI2a0JDTVZIMnpN?= =?utf-8?B?cXRaSVlTRTlBSzRuTFpSaGhMU0MraE1FMVFPOVMzU1pFcldCTnB2U1BkNkVZ?= =?utf-8?B?Z3pEWU42eDlYVURFRUdVU1ZpK0NsWFBVbVpGbGI3cGNhWVB5eDRnYXlNNzVY?= =?utf-8?Q?cEGV9nw3Z+eluwh4gE=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: af593759-c767-41ca-00db-08da7e782170 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2022 04:39:25.2259 (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: AM6PR01MB5173 Subject: Re: [FFmpeg-devel] [PATCH 1/6] avcodec/avcodec: Move initializing frame-thrd encoder to encode_preinit 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: > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/avcodec.c | 6 ------ > libavcodec/encode.c | 6 ++++++ > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c > index f82d9e9f74..0451f57f82 100644 > --- a/libavcodec/avcodec.c > +++ b/libavcodec/avcodec.c > @@ -283,12 +283,6 @@ FF_ENABLE_DEPRECATION_WARNINGS > if (ret < 0) > goto free_and_end; > > - if (CONFIG_FRAME_THREAD_ENCODER && av_codec_is_encoder(avctx->codec)) { > - ret = ff_frame_thread_encoder_init(avctx); > - if (ret < 0) > - goto free_and_end; > - } > - > if (HAVE_THREADS > && !(avci->frame_thread_encoder && (avctx->active_thread_type&FF_THREAD_FRAME))) { > /* Frame-threaded decoders call FFCodec.init for their child contexts. */ > diff --git a/libavcodec/encode.c b/libavcodec/encode.c > index 7919b165da..bd66f138a3 100644 > --- a/libavcodec/encode.c > +++ b/libavcodec/encode.c > @@ -668,6 +668,12 @@ int ff_encode_preinit(AVCodecContext *avctx) > return AVERROR(ENOMEM); > } > > + if (CONFIG_FRAME_THREAD_ENCODER) { > + ret = ff_frame_thread_encoder_init(avctx); > + if (ret < 0) > + return ret; > + } > + > return 0; > } > Will apply this patchset tonight 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".