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 0985940FBC for ; Wed, 13 Apr 2022 14:51:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D0FA868B428; Wed, 13 Apr 2022 17:51:51 +0300 (EEST) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072062.outbound.protection.outlook.com [40.92.72.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F050168B1FD for ; Wed, 13 Apr 2022 17:51:49 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NqaQXod8CdcmGVR1SyFY2JidQrNZMdNwyDC1EKIOkFTtAETHysNwqHO6+ovkkOSTvfxljfAGXH7bkMAjZ9fu1bdQ1clGWMhXRGjbh/IsI16jQU2eSIjJNkvB5nXi763X2YZ32FR9Rhp701266DC7xRBUGV40CIh1hIeYgvoNGc4CmVQ8GFrFfvYQthqs2xlRpTmbD+6W5R1W6youjjgsoGlC2dXqEtQqoA4Vy2CZbVglnJN6ORiVag5W225fCVV0OlM8Mo4uTZBcr9Hxq9wotMaJxU59fzdp73R3r0yxtkPq8HJIs/VG99JyZS/VGGOqqusasO1n+hDIQOguqFXq0A== 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=7kFkPLH7wFSiC8UQ736n8b1GGnnLbSXSfNTd95aI9xU=; b=dhKkoXYSwg8xevipX4B8NkcGKgQXJ0YpgdXDwPwuDMOdN4+YcP4orZ7qfFtDAeyi0F0mdNbjkZSeLmBQFpdbV7xP5tLch9lVEQdDjev+N1gQTCHVlbS9CoZkXjLCL7q32DRIdZTJV/eeUcmmON4syZBmURCj8d+tb5uuuCcLkJoGvvO8XZmfz8PkbSWd7jIoyxl1Am0cSfiNJqzapvmHqvjGZGvp/3jc17KvbP2DsBhBYzYd9eKWAhk1wlTh+p5+Y5weixmibUGIFVAHJK3WGdmg2OlNKgRQDRQkhbOJ3vVRM/AsJUxBWRpHAbMh0cvVxqxnk4qfXe6zwFLOa4SRZw== 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=7kFkPLH7wFSiC8UQ736n8b1GGnnLbSXSfNTd95aI9xU=; b=thyYlly53jJj3vKR0ZF+Oc3mEkv8cM/HdyudC6jDm+CzqTh601NLdMORP+Wl2dpqek/JAGIMOYKdIvrYdBqxBqTkY5fechO/FJ78UkxB4S1ng7JsWCf2V8eKY3Zv5yZkYKL2PjAv7bqcavTDSEsn8x9lYsD8rG01V51SywH7w4T89kNNz1h/iWhUaUzpg3OVpKfRphO6EfDSoLNU7d9TJPjllL080xL2blN0CDuDEl7O8qdVJslmnod9RoqVrGHClGEv4pP9fh2KF7B3AplyXbnq0f8uEUWiVIQb6gNdtTUIeQXA0/66bufrdlVrQY9lyaKrdDZjx3kes/AFGhS/pg== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM8PR01MB7746.eurprd01.prod.exchangelabs.com (2603:10a6:20b:24b::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.28; Wed, 13 Apr 2022 14:51:48 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2%5]) with mapi id 15.20.5164.020; Wed, 13 Apr 2022 14:51:48 +0000 Message-ID: Date: Wed, 13 Apr 2022 16:51:46 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220323155720.20017-1-anton@khirnov.net> <20220323155720.20017-6-anton@khirnov.net> From: Andreas Rheinhardt In-Reply-To: <20220323155720.20017-6-anton@khirnov.net> X-TMN: [OZVDDy5iUhF7+xOSgh51CDLbyd0SIib9] X-ClientProxiedBy: ZR0P278CA0160.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::18) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <30d77e38-c0ac-7ef6-583a-01d43ee9f286@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a20b1c03-e1fe-4d80-f289-08da1d5d22fb X-MS-TrafficTypeDiagnostic: AM8PR01MB7746:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6WJp+qcD6c8wUnYtje8t7rjF3WulTKWyfk9Xdc0gOIVTXGqirNPkJqWHm3JgqY2rrdi7TGupbRDSZxdLKBhjqzTme3sSjG2dbYPwEAakSXahCdWbBuler7JxXvUaxRCqY7Ot9A89v3Dy7wxs77Qcj8E6y1Uwb7asKst3nZ+TErzYY03y2mNdar8pgW8tjNsCsUoh/rD41Gy1IgeOrnjxmtRs6FqMaWjNDOaK+Y7qNqpc6p49HV696IV8O+Kb9CYy2Aou5TIoMh1u5++hVOOz8F4+EXS3rArI3HapqZb47tCKwEcUVORYKWq2RQuuCo8k5IClwsLf7DGghdjmjHYLhyGosjKt6ZakTpr2TmyRjb7YFgbhH7WxHP1MQII0sNG+ePdtnPGzzVk70s+dMQ+g7CvHX8EN/6arcsW8JEuwgpZ71v/b4SQ9zLbK02rUS4fG0kltaDxz8KMqOO4+V1lJg5YBu/XRUJeTkXyOPBua8jkcM33eh5Yp5httHoAYFpJNCsK7ZBfrwcpY7FLt9jlOGIk0pHurOzd+cNwdw+hCmUCZpzJJx/eGYrpMDl6JMWZdv7cdrH84/qPn5PAINAP65aiteSs2d3oeEUwotuYHV58oKXi+XxFpWVGrw0JEtbib X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aCs0ZFR5SVh5dGsydjVhbzBiUklSRzcxZWdZcmFwc2JiTldyQndvM09jL3ha?= =?utf-8?B?WGsycHFFZkpKV0F0MStEOGxuWWppREdpMDYvcStIdXNXdjVudUZUT1YrdGRr?= =?utf-8?B?eTFPTHFFaStxZE5UUm5WN1d0QW5DekZZSU82VlVEZFhZQno0dk91Rm5iSERH?= =?utf-8?B?c2pTNWQ3MXJNZWR4S3d5azdkbjJXaGErTldFMlhDRjlDSjNKWDRocGErM2d2?= =?utf-8?B?RU9sb0MvalJ3cTBCYmFSaUFVQVZrUWhoU3JTaWhkTGl6aG5wUkYzekgvZjBo?= =?utf-8?B?eDQwSmRZa2RPa0preStqT3dHaFR3M2UrRkJxZ296TDRSa0xSYUt6NEp3OXpR?= =?utf-8?B?dUszUDdtVjF5Ukg4NndPdkxSM0x5MkFLUDgyY0c1bVVvNWs4bXZtSGx3VVdm?= =?utf-8?B?bEZsWXR1TjlJcTBtSk1scU9tb1hoT3g3dm01QUZkV3I3TFhVU2FyRHlsTHlO?= =?utf-8?B?MTc4ZmFRMjFRdG45VC94SXg1UzU4cjZVQXJidWxrYnRsSTl0bGsyQXJXR3hU?= =?utf-8?B?UkFocDkzYlh2bGxjWXk0cDFMSXY3YmpmRlhRUHhxeWdVblF6NE9DVlJibzM3?= =?utf-8?B?b0Jvd1pjQmV2dldxRDEwQW5Vc1ZTaS9DeWVoOE5FNFlIZVVCYlZSa04rZDFW?= =?utf-8?B?aU9NNGYxUXFtMmQxY3Z6L2hxN2RlUUh1UEhDTXBOc1d6NW8raHBpL0srYWc0?= =?utf-8?B?eGhDUmdHSVg5MVd5UkUvbDFTVjU0azNHeE1RL0ZNV05nU2lDM2orN2tMNmJJ?= =?utf-8?B?U0RaNWxpdm9TQmsvV08wU3FBdDIzWGcrR1JHZ0RSQ1BPTmIvbzhQRHFKTmRL?= =?utf-8?B?b2JiR1hnbVNiWXBWWlQwZWl1TUx5c3FoTVJOZUFEZEsreUlzK1ppWkRHTlFL?= =?utf-8?B?ZmVibEp4WUFwRGFhckI0T3dCcytpTVFMRlJvVVp1d1JMaUtqdmowWFNEN2xX?= =?utf-8?B?cC8xUlNGYWV4d3dkRWtoSFYyNG5NS1JxYndFYlptTWlMT2UvTzZNMEZtbk1D?= =?utf-8?B?RW9lanZwZ0xiUnJjZC9oVXZsR0tyY1BHdmZvNkVNREU3VzU1emczM2wxVmtX?= =?utf-8?B?bEhYQi9TWkFvejN0b0psQldPOFoyMUIxNVJEZXFmb1I3SUNaQnJoeWN0WEVK?= =?utf-8?B?TVRGVDAvRWh2TTBtVThMMzYzSlI2RU9jM2RFSWlIYVVzMUNPUU5DcEFYL2Fw?= =?utf-8?B?VlExTEN3U2NqUWYzRnZkSk95a1dlVHJPOGdvcUQrdVdVelI1S1BNOFJZRFhW?= =?utf-8?B?VDJlWVhwRE8zMUtaUERNUnBiajBXVjlaUzZaUytaNEZwR21IUmtTTHRxOTRD?= =?utf-8?B?cHV1bTZtazBsSThqYXBZVCtyWERHaHhKaysyQ2R3ZWdoVGM0SWF0NThmRzI3?= =?utf-8?B?dFBDVnZzV2FlT3JVcnhjWEZhYnRTVzE5a3lJZHVXVEo1dzJ4U1JKYUg0VkFn?= =?utf-8?B?Qi9sb0xlbnlqU2x0c3pNVEV5SzRtTkJIMFN4ak9haFpXOGRuNW5DbnpZcGdq?= =?utf-8?B?ZjEvNzVoRndlQ3Q2em9EVzRJc05Md3BCa3BsUjZtUWpIczdGNjlaS0pBTmZV?= =?utf-8?B?OXk3MllJUHFncGFRZGVJemsvbTFpZVlaR3dlc2pBMnJiNmtsRkVQeXJzUzQ2?= =?utf-8?B?NVc2aGIxa0NpWEliaHVwUXNDakgvWW9wdHdycVJGMXAwTUkvdXlrQ0dxU2xB?= =?utf-8?B?WnQrZm9Wd3RBVmpyaktEMk9PNTc4WXlia0lNK3VmNEVNc3pSYml3bzhKRnhn?= =?utf-8?B?Uyt4UWdtb1o0blFnZUdQUFhJU1JMVnRmK3Q3QTg4WUpycm5MVzhaUUtXMXIz?= =?utf-8?B?M2FFdWxKSlgrUDZScVpGT09QQitVSVI4bDczNFhqOHdTd1pldXcwN1F4Q1FY?= =?utf-8?B?ZEc4YkFCaEg4cGNUbHdER0dXV1QyTG9UNnF6NXUwWDhRMzVvZjdyS0JqRm5X?= =?utf-8?B?YjNHVkdPaE5ZN1A1UTFTZUhBamhyRWUxaWt5NkNFbzBiWFRpVmVUZWJCQXEy?= =?utf-8?B?OGdmTzNWSTdBPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a20b1c03-e1fe-4d80-f289-08da1d5d22fb X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2022 14:51:48.4647 (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: AM8PR01MB7746 Subject: Re: [FFmpeg-devel] [PATCH 6/8] lavc/avcodec: only allocate decoding packets for decoders 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: Anton Khirnov: > --- > libavcodec/avcodec.c | 7 +------ > libavcodec/decode.c | 8 ++++++++ > 2 files changed, 9 insertions(+), 6 deletions(-) > > diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c > index c7daa385e7..5fd988a41c 100644 > --- a/libavcodec/avcodec.c > +++ b/libavcodec/avcodec.c > @@ -180,12 +180,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code > > avci->buffer_frame = av_frame_alloc(); > avci->buffer_pkt = av_packet_alloc(); > - avci->in_pkt = av_packet_alloc(); > - avci->last_pkt_props = av_packet_alloc(); > - avci->pkt_props = av_fifo_alloc2(1, sizeof(*avci->last_pkt_props), > - AV_FIFO_FLAG_AUTO_GROW); > - if (!avci->buffer_frame || !avci->buffer_pkt || > - !avci->in_pkt || !avci->last_pkt_props || !avci->pkt_props) { > + if (!avci->buffer_frame || !avci->buffer_pkt) { > ret = AVERROR(ENOMEM); > goto free_and_end; > } > diff --git a/libavcodec/decode.c b/libavcodec/decode.c > index 3733e6d4b8..bb3857afd9 100644 > --- a/libavcodec/decode.c > +++ b/libavcodec/decode.c > @@ -1527,6 +1527,7 @@ int ff_reget_buffer(AVCodecContext *avctx, AVFrame *frame, int flags) > > int ff_decode_preinit(AVCodecContext *avctx) > { > + AVCodecInternal *avci = avctx->internal; > int ret = 0; > > /* if the decoder init function was already called previously, > @@ -1605,6 +1606,13 @@ FF_ENABLE_DEPRECATION_WARNINGS > avctx->export_side_data |= AV_CODEC_EXPORT_DATA_MVS; > } > > + avci->in_pkt = av_packet_alloc(); > + avci->last_pkt_props = av_packet_alloc(); > + avci->pkt_props = av_fifo_alloc2(1, sizeof(*avci->last_pkt_props), > + AV_FIFO_FLAG_AUTO_GROW); > + if (!avci->in_pkt || !avci->last_pkt_props || !avci->pkt_props) > + return AVERROR(ENOMEM); > + > ret = decode_bsfs_init(avctx); > if (ret < 0) > return ret; https://ffmpeg.org/pipermail/ffmpeg-devel/2022-April/295326.html needs to be applied before this patch or flushing an encoder will segfault. - 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".