From patchwork Fri Sep 17 02:08:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30302 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1785277iov; Thu, 16 Sep 2021 19:10:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUOIYwIeCYyH0149uAZR3Z89koks5RTUeFmVdWuhzTVDYWoGiVn6I2LYOjD2taHFdNNwUJ X-Received: by 2002:a50:8e06:: with SMTP id 6mr9583951edw.107.1631844621198; Thu, 16 Sep 2021 19:10:21 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w8si4999347ede.307.2021.09.16.19.10.19; Thu, 16 Sep 2021 19:10:21 -0700 (PDT) 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="H/UPESoZ"; 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 E252F68B157; Fri, 17 Sep 2021 05:08:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075092.outbound.protection.outlook.com [40.92.75.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB17568B0FD for ; Fri, 17 Sep 2021 05:08:38 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JgDIp2L0MKxOAct3SGhjpqUwEQEAlNetrqkc2/irBntvWTc5F5YQyVWA5PywBUy3d827l+snRN7CrWPDJgkqxTxePeYiGKDSsu7m1GAnyEpiYYLwxreaG9XwAEl6V2pOtZfrXOX9lXqEwQ0rMjweer9BHpJYZxvSXPuF0C4XaogcPH2nq6LUYc14qzdT9sW28mKhURDFEdUvr4eXjNTE86LRnjGLIM12iwwMsAuVo9fm8h4FPV6Hw8Y1VEh5OYsGW2Op0a3VioAUMeBhGaJ62e0Ul39gttb3+jNP6k2Rz0eWowhGaDH96wZrX4J4RdOU2IVK96nLzJS9OT1NdyHjPA== 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; bh=HJkz+96Ld2pGL5u4wMHvi8KAdhb0Tnqb1iKlz4M4Ts8=; b=F80BLmKg6lmHbD+bVKCCOHFiI/SrotMn8pd5PbWQQebxjE7csCbw5vO544OiHlKOTe2PojQWbRCwDzWO8FOh1f+2h6NudgJpFmzngMwbn5aG9ZdXqrZQN+fnWWZOE+r0tUDnmD2ZCYRwiHiZ6EH0PkXUFo8otC4043spl4exo3sdbn731znxxnLpOoO8FpyYN2nZdaC7jXIhhfjDpq5+PQ0ntioMe03WvIE8HH6bdHi3K63bLFivtLwHGS9Bgpd4GiPJm4aMbFMSfwrQlNVScojpi5KAbwgByjundLO6dOW1eb3FZF7srR/9WSjEzvQWEM62Z18a/qEQ/32DzDbK4A== 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=HJkz+96Ld2pGL5u4wMHvi8KAdhb0Tnqb1iKlz4M4Ts8=; b=H/UPESoZxXkFsd7lHHhnOJ47pnhF9iTYS6FUEC9PywhN6auflm2EQJ4x3KxEYfjTZgXPpms301JzNE5c30seRrZHBERb3k/KBtfFErnN3A9tDE1cxQ/4UcRAkpWA21zcohJSLzwYdd4UuVbSyrYKYZukkCbV4Wnem6g4Gni+LBfKxtEnMYixLGB2wE89FIP0hGCsJn58enGKw/gC+SjclZjcZt3g09IGKSc/raWF9H6+18VIg3flgWe2zZfSX3NLQA+8dJuG6P8Z3Gu+ID3jXc0OUWexhTFRYmr4xz5stOICxrd5/s8h16mwolPh/6TYiy39GLOXSFWn7mwVuipz+w== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5297.eurprd03.prod.outlook.com (2603:10a6:20b:c5::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.16; Fri, 17 Sep 2021 02:08:33 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4523.016; Fri, 17 Sep 2021 02:08:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Sep 2021 04:08:07 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [4wzczyOxh5eA2WlPRhQ1EIK03PoZLBfa] X-ClientProxiedBy: AM8P191CA0018.EURP191.PROD.OUTLOOK.COM (2603:10a6:20b:21a::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210917020808.275498-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM8P191CA0018.EURP191.PROD.OUTLOOK.COM (2603:10a6:20b:21a::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Fri, 17 Sep 2021 02:08:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5ac8680a-a558-47bf-a436-08d979800d3c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQB5KKqMro6wr3957+0yV3UPHqjgAfOTsEEuuY66i4Lf2VbVho8AeEnmFDd0o+8rjFRx1nBueRqj/eiYbexJ5qJIP/4P0aWq0ACmafa5MK58AKaXJLkHaRcfenzPMQrnWtLNsZ8BsYz2Q6GNCjPkpAzpA3s0i/ig+H7I1e4uslzDIWqLODzhZlR0GYfkzf7eMGaE97TLFkbkyVT+CEqyZhuZdvRYeaCOzhGOJGWr+eUl3UgiiGoLCXi7lixQ3/5wQ2ZXQLN4XLQcSTgcGcV6+xyOOcYPSPHFbBjwHJSujJt8ybh3imEqCqN/JMacHaRg5RIUVeHDtEGPWR1Z7acEkH48jB48HcIp7MkHv0ykHGRrde6s+8py/79NQehy7oHwVAo4N2XU/uw89gCYpvFFUmgFZWLJ+g1HRnzeL9UiOwJ37vU3N2lQ9A2/K/Ay8siCynSFuO+pFJeb95MMAKF7xbSlqEJ0kRK/W9RlZARB/WGFORQxdeDc6vj09ilWcq/E0SddkGpxXPu7t6f3Hepz0wydIWXyeLp18ySNpDaVE97OKlrvFtPbbcIz/bvMGy+qShIaeL2rIuY15fYqzatoxyK283tCPoir9q8uP+TjtQZzM0AfJWmPcelDxkqPT+yAp4waSr5NdBuxgPq0bwkuoxGS3AtiBtWiQUba3/K6bcQNreIbiVV/nMD7igYQclgVeTH/54Z/VOAS5N3hNGMU44vzuqVpDuE0oWLlsd48OZOSAIxFmclBvT12Mklv8Aaje4= X-MS-TrafficTypeDiagnostic: AM6PR03MB5297: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ouh/QlxLyxBbADP/bNg/XDisFOKDVHKo5l8zZ+B8ptpYX/d7EXPaSa7M+QjIJERktG9HwvUeXGGNpVq8VgjOj2kPtJ0Mkv1DcGnOYz2Ajo4fxQspQOOARIG6uj/+laz08lEWWf1+9L+mSFiIZGE6XUrqfkK1d1EAqqVHzRzrghruwDmkL4hgiUFJeGRzD6f2duTiO/6GUy7qe+VKVCRJEXOmir8JhWI1v9GRA/6Mg8i0V9vveUtMusbx2NC2/xmOvNJ8VuPd0m+VG3Sl4AkQhaM1ytG5zhS1CYaCU9Xzghhb3gaM6Ws21feEwB0TeZgiubUHzAkg8islWehrpouoMArdcZhUbPvqijiviWSZoHcVIxSwBoIvR04Jlowx9WATk20vLVyyJPJLnZN1hyMCJtLUS0js6dMY/VrGnLngLIOZvn7zVTkg86Mi5CXYt7+i X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: B0xMkbnVtRWILTQr5g+NaY/hV4Q72nciBrOBCCvSa7EdxO91F/xwkBqrgyfUwA8o/veGtKOW3vBRQU5u7ruKIiLZwuep3uLUE9qHx4BUejeHZzZbzpTuUh92un2Wwq0/RH2yZ3sdAeUpKfawX7qAQw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5ac8680a-a558-47bf-a436-08d979800d3c X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2021 02:08:33.6370 (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: AM6PR03MB5297 Subject: [FFmpeg-devel] [PATCH 12/13] avfilter/vf_elbg: Check call to avpriv_elbg_do() 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: xK5LN4DoFIUH Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_elbg.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_elbg.c b/libavfilter/vf_elbg.c index 2c9c861d02..fac3b6f7fe 100644 --- a/libavfilter/vf_elbg.c +++ b/libavfilter/vf_elbg.c @@ -142,7 +142,7 @@ static int config_input(AVFilterLink *inlink) static int filter_frame(AVFilterLink *inlink, AVFrame *frame) { ELBGFilterContext *const elbg = inlink->dst->priv; - int i, j, k; + int i, j, k, ret; uint8_t *p, *p0; const uint8_t r_idx = elbg->rgba_map[R]; @@ -164,9 +164,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) } /* compute the codebook */ - avpriv_elbg_do(&elbg->ctx, elbg->codeword, NB_COMPONENTS, elbg->codeword_length, - elbg->codebook, elbg->codebook_length, elbg->max_steps_nb, - elbg->codeword_closest_codebook_idxs, &elbg->lfg); + ret = avpriv_elbg_do(&elbg->ctx, elbg->codeword, NB_COMPONENTS, + elbg->codeword_length, elbg->codebook, + elbg->codebook_length, elbg->max_steps_nb, + elbg->codeword_closest_codebook_idxs, &elbg->lfg); + if (ret < 0) { + av_frame_free(&frame); + return ret; + } if (elbg->pal8) { AVFilterLink *outlink = inlink->dst->outputs[0];