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 F3D8846EC4 for ; Sun, 16 Jul 2023 14:50:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 50A1768C697; Sun, 16 Jul 2023 17:50:39 +0300 (EEST) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2078.outbound.protection.outlook.com [40.92.59.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 363FB68C685 for ; Sun, 16 Jul 2023 17:50:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PsJdfU9552KmhAT2D9vCcwUJgb2UuJGZAxe7XAoq7qhCfHhJpj870mcjoMIUjHefB8p+eCS585uChLL8n14AhMPBenDkyEAAUXpMbrX/AY+Lv5kA1aXKXWqubtZxP+V3XvmtqJbK8N3zSvCwSxCdajs4Rz1TeE/sbngbzmd8Xob6rYSAimIXx4IF5bQU4MHJkUQaOl/9mQIt0UlBJSVeZuiVlNEo4SmYODRjmg1k4vTY3/T7lLrp24mG0nk0sUk1Jv+rSas2lxEjACje4d+U/hy6IeOcwsD2DxFnAm1hBe99O0ujOM2KHKPFlMwOz/U2NiJPRnxVOeXQdo4P71uZjg== 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=+pIMbySxAiMo0gaXkiB13j+oYea2z9m6YOEruRtl3w8=; b=evF3nG3mpxlN+T374fwv62VFm0GkHhdu4H042lm6QQwjut4e9xwQ4g1gNrI2HWRCHzs996sEJLkVEL4mcIwsZuOj+8PsHJhKCRzOzENmVOizJg/jmvE5ehyRuIoR/vh8eYld4EcYmq8+LA2xQ4nkUbeaCVdzPq2K96bCYSxgG6GVij/91mkt8zMmDyP+qoBtG6Aw/Xsx41MSf4I8l4TKruE/DqesumUndbyaoiYK6IGKV8khpVLABGPJPlYVSjanvtuH98SOq92m68KnEv8UcaS2C5pXC7zYmGPMGNrUG/7wJ4Uq31VcAou9M7o/MIBAF7VU1vxidD7SHKjaHKJ9jA== 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=+pIMbySxAiMo0gaXkiB13j+oYea2z9m6YOEruRtl3w8=; b=mHzvmEDlB8o7zSEqjT9/LU1A/crMuG22p9F7wVx/D1drjJmXgZqH5v6fZLpLKCJO8d9hEMRTFkXvxTSC/ag5B8F94n/IM9GOu2pFvo39Dc34gAFGLMfPB83pldV3EQlZ2DJtbMaMVyTesklRlXQ1NNjLn+ktO0we8OMwuYGjFA25O/+rAhRlDcYtLiOc0fhgrQrMDnWxx1NJWpdnhzV36wfzt9oW93TBb1EsJeOBP9lruD5ZwbhQyp7lo05CP9TnA6abyAU+NgU/zyPvzClQ/KF+EZQQMqSO++tv7TjQojA5UtMexTgxUfGbStfvdArShm9uxJNaUt+DUJ3T/acVtQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0385.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.31; Sun, 16 Jul 2023 14:50:27 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::7ae2:75ad:dea0:86f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::7ae2:75ad:dea0:86f8%4]) with mapi id 15.20.6588.028; Sun, 16 Jul 2023 14:50:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jul 2023 16:51:22 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [q4UhQ+Bre5LKehctFvET6jjoWPGVDTI2] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230716145122.4185953-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0385:EE_ X-MS-Office365-Filtering-Correlation-Id: 099e5787-3a79-4c60-b0ee-08db860bfe82 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmrtEmGPpqLThyiwcQNaf4D/wdjFtM0z5Fw1pk3vITlwNEcVShwxpWu6zWvfyutHYOHhnLhXJpzRTbMaTJDbttepdsOogTuJo27nO2PC/fci/4sOzyBYhnW+Mzgng0WMUceQ9bqpgd7LOuWNW9sxoJEWl1Y3ahfdn/EUJT4YlwH6QYUafA0NecwGNrWz8CtwGHxQ6OqIlywl8i9c7qRz2uh1OKHsAdK/d6X62lCwINQvJ8NWHSAPM1t+LnESFSF6T0hQr7UOYeil593nRxglj7XBptvLwblw+nqSNdn9JNAbHy83j0ZOFUVKBYXexkr081eCp9DTAPD/+JxehfC90KhFw2dTiAcmAQErJoh9BcjhIeR3no9BtLGkeM/tXcqE1rnKZampmTOhhSJTd5zBjVlsObVuCHtv7DY2BhRfCpkiqLZRHv17S5n/xyJTySmZi02HzfyGeqRqoyryEmz+AiW8OoVVFKoGJ6rh6R396yxyID2Sw8E2DgWWgoIezbXa+1sEw6x+IJOx+Kt8meeQjHGexJAsB4TzlDArLAPkXhyyvn26s5IjdX4mtEER/7E262nmhwk18pu9c2aVOPiOTYwB5JSaodBkvHrwoinACfvMpnvYc4ZSFF+xlgUJ6NXAeBE5KURtjdm7te9tltSWy2I7IID8GrNhFZELlkhsn/yWCXveAsXCfu5tjMVBMJa0XgCe64JzX49QopNgwdbuI7Ht5TMHseqQC9nU5f5DCVeOPgoyFcjOsg+7GSk8+iz31CE= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qqVVytUn27oKMRO/N7CnKkdTfvPS+Y9OMafXSerF0W8ZQgGVt0fnPr24ceUljwzwOpKAJSONAo+IulQw5+Il6a6qoVYdJfbg0pyIf88agX8BHx4k6miSGKm2V+qaQ4nWSiF6/EHtzh4ikrvo3oJmtR6OCUJ+2NoICzl+DmFYhGUbsoISPNJ+aSMvtnTkm5QKJhfQpCu8klNivHtq5tsEHo0uDG51qvuDF3V7Uj6TjpHsC3uExeWBBTPGW33yH0qQY8IIZN86vroag+o4+becvzYzZb1agyfKOJ0a7fu+Ue39XGGBxmLjjjlPHqLIl/XCDtlpYymRtzkSvz4xCVOoICFT1qiUtQ/gqijGnnZqDiT+lZMn43b6u/0swIq1dPm4gjfUyLCBdVTRF2ZnMuFfIJ1ArODLruSWXvTwal4JZMnyiZ8owRSRieaFKDzd2AdUVDQwkXsqRpjETYH4jac09rO38nEUseL6xYy4TAZokxqKiVBXy6tgygciInrvjV9IHOsassjaqeYAysZjKX17oLsYvvKjgh80wzbDYyY629BBKPlL3aPZywvp4yb7PAdPO0OYUv1ECq7BTxNCcXDXpKGyxzFo51ChhDUYNKqNC07YEQLB3TqZvuDsUvDWY5L+ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?e8NT78Czn4VCIGoxj6SVbMY1WLx/CWdhhyQrQSTrSGLVdiT1fg14Dd/iOnGh?= =?us-ascii?Q?ZWm3wP6zwecmq66PHanSUiIWmM/z/xx6gXOfS4t38GXVbNXl91dNXizM4Z+X?= =?us-ascii?Q?6l2yAKPuMi6vppx2P8AbPqzZ8jQr7rzN3vpsWpIzL7X37ZRbAG4e5P1EZdgT?= =?us-ascii?Q?9UsMu3Nrf+LQuaD35YND6V8bn+XbiMaOrttML+wrRWrM/0REZBSHiUownx+J?= =?us-ascii?Q?3+cYv9DzCc1WLT9JWb1uCT+gND1ymu3lWXLDDaAqkp8vNeLiF4JsQ+pXdIMA?= =?us-ascii?Q?LiTx8rGdotVIZ5S4yHZYfs2nPp+BjWH/f/Tdmqx0fd8RC1pwEiQ9o0CIYkHb?= =?us-ascii?Q?MAVRtEbdBgIfJcD6E/buj51d8ppKT//faXzME9iRqtptyOozW1tzhziUIu2D?= =?us-ascii?Q?u1rQIcPxhx8Pbr6ms3HSZB3tuePOZ9rfW3l0iDbgmspTDzwG9Ge+f2Wjfe/+?= =?us-ascii?Q?Bm6QKIR9co0u6qyi7IxndSLuJw1gcfCxShsBzu9kbNrb4HNjmPnG9qftK1v6?= =?us-ascii?Q?OSojnUzMTAOni46vgAU2k9zn0LNOeBSE/OFD9kZQpwpKsR5MpSjJf47zpGJb?= =?us-ascii?Q?DIrtH+dwii16769ASd3rDaXQM+cNbV5nQXOixqO+/0j/VFQBO1Qkd+WlGqEN?= =?us-ascii?Q?6qoNgxAQUCbzb4LAuQfXmtXaQvQaM8zZC/REf7Xt5JVgpOe1XuwSucAkrL+D?= =?us-ascii?Q?mqmc6rPYnQEjLjlnV0RxXLTcDAa/0DBLc+Cpm/tx9SlAhRmXT2hKiPigoSeA?= =?us-ascii?Q?6kVK3ad/9ZYibhgIr+jvrzNKXoL25tcMYN9VwRX6AS+K6724MhNgujIPNexh?= =?us-ascii?Q?hPT+ao3zYNgDmnJgMQIqbr3hyoTNHEsr3V9/s600JoRmmSD5e72LxPCkiUQY?= =?us-ascii?Q?p6Lyk2y1dnOIy9xN5U9cEOfQgRdpbIBfJndQAw2oBCin0ihp9cZAypFoZYrR?= =?us-ascii?Q?YbHYK/nPk+S6tuD4pB4ADclm4WnYh0GZOKtplHbTGVXTI9bG4lJKmS+VFZLo?= =?us-ascii?Q?nIRJgO2b/ahFS4caMiWdGsTtBp2i5kfQObAw6nOIbUGdN83B8hNEauG67Icl?= =?us-ascii?Q?5ZMWTxxKjOIKCN3veiaj+sPiLdj5vyHvvwP21qPYM6ZEhgIJxy4mkH53Sbkg?= =?us-ascii?Q?uiV45qKdH/j1SPx3tNRvQBwCsNDU5AbHOwZk8HoZQ0977HunBfaum6An8lni?= =?us-ascii?Q?pWP9HFyEq1u/fN+DyCLpHDC/KZYO2VaUeiUtg95LYpFjbkcuJtaLX0w0+/bM?= =?us-ascii?Q?RfLO0M1XshbmMM8ECwKs?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 099e5787-3a79-4c60-b0ee-08db860bfe82 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jul 2023 14:50:27.8716 (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: PR3P250MB0385 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/msrleenc: Check frame allocations/references 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: Also allocate the AVFrame during init and use av_frame_replace() to replace it later. Signed-off-by: Andreas Rheinhardt --- libavcodec/msrleenc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/msrleenc.c b/libavcodec/msrleenc.c index d5931f42fe..11f7d2a319 100644 --- a/libavcodec/msrleenc.c +++ b/libavcodec/msrleenc.c @@ -37,7 +37,13 @@ typedef struct MSRLEContext { static av_cold int msrle_encode_init(AVCodecContext *avctx) { + MSRLEContext *s = avctx->priv_data; + avctx->bits_per_coded_sample = 8; + s->last_frame = av_frame_alloc(); + if (!s->last_frame) + return AVERROR(ENOMEM); + return 0; } @@ -265,13 +271,7 @@ static int msrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt, s->curframe = 0; *got_packet = 1; - if (!s->last_frame) - s->last_frame = av_frame_alloc(); - else - av_frame_unref(s->last_frame); - - av_frame_ref(s->last_frame, pict); - return 0; + return av_frame_replace(s->last_frame, pict); } static int msrle_encode_close(AVCodecContext *avctx) -- 2.34.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".