From patchwork Tue Oct 5 20:53:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30910 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp5776704iob; Tue, 5 Oct 2021 13:55:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+bLXg4d98pMvWjoaC9X8bl3STBX4S2/6DZn+HL+0LuxhrceOIujmnycmX1RCYVYHByDNZ X-Received: by 2002:a17:907:7212:: with SMTP id dr18mr24270344ejc.298.1633467306009; Tue, 05 Oct 2021 13:55:06 -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 s14si23548329edc.372.2021.10.05.13.55.05; Tue, 05 Oct 2021 13:55:06 -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=AnWYzvss; 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 D71D968AA62; Tue, 5 Oct 2021 23:54:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072058.outbound.protection.outlook.com [40.92.72.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9A8DF68A9DB for ; Tue, 5 Oct 2021 23:54:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FboKcJTeCzy3paWeYSCRpoy19sLforac4/+BLDwfrxhiWOl6ROwoVVNWR0iP6rWG21UdefhG8VadghNZtlCU7M6ravpsbkv4XLIQU3DyZqj17ZzY3jH03TNNfmTcVF5SVNGmN9rLp7mAOAcCUFcqKt42v5BO85EArbIp9nBDe8ug6/FCMNwbXxZ7kGNmgE1O4boiEdSHreu8+cd+qTtxXt1qjnqbn1ZXUx6Srv9IRzBpH8s6qgRpGzCqjX/fTWxyDCgFPlBv8+PgIs9N0T8WToaYoIuBRWD72NH9LF8gSMDgpbKd7iTrsdDSNZ1BrtVxPGoXGTOBTuJIU3g/RXvIAA== 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=Ab7H31DnA82omnRBvLcsSg1SYTBOCjrTjoLaSxp/RVU=; b=Z1QTp2IiAqzBGXRblr5MHQhiIV7JNYOJFCbjEN8ruuKr8SVpDWnWOsYAdEdEizHAvwFJWMfeSJaIqi7+YcUif02Ixury7C10QzqZNCB7ZU2Wpzim3rS5n4dLv3lDUHtDfcSu/ZUHtYvUUt/ltxXbMj5VRqIEwFUAFucX4UoyyN7n2YC3t8ox2FuoFnepnio5oKJZ5RhMD39HVT7+Ele1a3CvltmBNVoiJPGGHSIaSmxXezYL/f15XiIyWZerVonVCpY17FG2HuonsVjZ7tQpz+M6XRHhKHoeW771LWDMni2oPmccY3flMJtYDQIoIixmv0YDBkJ1E7zJJh9oarImUA== 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=Ab7H31DnA82omnRBvLcsSg1SYTBOCjrTjoLaSxp/RVU=; b=AnWYzvss+7W0IcxO4y1eCj2Y2Or9A8JCvsqy85uKf0YE8Z1jsi5zNgJ6gBc4FJzF1uc/PBv2B3vu5rlkAcj06NQKbo6V5ObA/tCR8aIyceaUl2Sdt3v0LuEErNQpEdkjxLlX8adjWV7d7suzCesqmi1QR/+G+9xTQVnRQIxx2l/q/LvJu3qU3RNqSxJFtCaJFTjpEmWEOYNDAhQjcqyJQ0qANSOZAUx714P64MFBrmWuocJszdsR3bLiepkJW3axkr8s2ydElcCKMb19YR4xRYYGWnQ61vRMVZ2pEVWmKtMmbiC8D6CW/tdc+j/O7Lz2XDTOL6vKpvtmzdEQI6L7Tg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6184.eurprd03.prod.outlook.com (2603:10a6:20b:141::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Tue, 5 Oct 2021 20:54:07 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.022; Tue, 5 Oct 2021 20:54:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Oct 2021 22:53:48 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [HzOtpdqNX0ZxqR1Nkj6a8OBfmuTuBBxk] X-ClientProxiedBy: AM4PR0701CA0040.eurprd07.prod.outlook.com (2603:10a6:200:42::50) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211005205348.519944-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0701CA0040.eurprd07.prod.outlook.com (2603:10a6:200:42::50) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.8 via Frontend Transport; Tue, 5 Oct 2021 20:54:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 475e5ece-2a23-4359-250b-08d9884245c4 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiS+KSxcjYi+gKEA6YP+MkHe01L3o1+XGxL9a6rbAAw8IByjHV7166lcEYXvAXICu+P86vA41df87bEOKjv1es2FyjDK5joy9yiGqVHI2zgUDJZifIcVg7GA6pRTqfykhy1OIqOsoAzLKp0Q6eHBWhE/rqHEI7gqBMhwH5ahgiMWQMm21Mp4W0WgWYmSZNDsqR+yeg4HxNLEywVGw6OZqo3joVAk+m4EyAsX8tNJmDAIyzRBQSZn4WTGgtr7ZKdFU4IwZfxpHrLItTSwiosu3vz5Cgwgw3AW39UXIwelOZlYWJ1+vAOvkLgGKE7FyNZo7te19bfv2MzwpDr9JduutFAvEV/BMhSjLtWfQ3Y+NUaB0rx0+V3atnnKW8VMzcEnY8RQQ3U/r56o6/tvlqlAFXyihoZzlbyy4A+VNc0YEeJMjLBj4lID2bBLBAPU7/M1ZAh1xPSBlYLsmliOkAQUVo0h8Y7onpr0EEYzpV3aOeweT4Z3XVkkTt6g9k9H8wYJqRStpOk775sqwrwMUr6DVKxzacjYk5fY4mwvXKPURaVQd6gyxcavtsj74a4cEqg4V9UfNF1XqZgpwzDjK7JXicsVAZ3rYiW6tj9EduIrkueDJLsV+O4tF85WBbFri023DrNohsyyH7v+lGHjZ+AjFvRHRRbDx9rfSFcwpONsO8TqOwlt0+/VdHCn7Ae0OAJpxg2iTHkbc7Af6dr32CMhkeoIUTCcrX0xML0DNWiQ7CpgZyfQQv/4qtrkSThfs4zfaeg= X-MS-TrafficTypeDiagnostic: AM7PR03MB6184: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gfQjEfuvySSOwClybaiC/6aJUFVt4o+dYhkcEK3t4bsm99LaKvY0sj3+EQSrYmQfYwq9xC3ptA0kwQ5tyqBv0PVpFnFsKcFs42IfJ09dmBaB9V29bHmu9IWpa1kAajoUonD9g95PYCD70fAHvk5vymLrRX3W0h8eFb7zPhEaKQ/Y6N/XRk75yHK0rluwloTdepLEl6gOY0zu76mrsK+rCAjWJ/Fx2e7q2BTfL9lsUtwJ9I12SOLn949iFGbsgUjuVL3rlxe2kOTooDSjAc0qV69smWnNsng6f0MzrLChrdC2r/mJ7qpA7kN1IEGZPZmBWrTpDuuPSvsGsWTfrF5mz5oycbWqKECsfslMs1K4SAkEJQefsEEweeVZH2/pyOsvxRJwXd1+E3gZVw7cGRWaruqYb7MhBMY5K0qcEf+cr5JNEwCGEDjUfIUB18jSaMk2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3Ec1POz8JeX8TjhWB5gI2KM1xDkDWi8Q550QowAHqdMTcG/d1MT8Vwo+DqQxKSaQSsbmRR4aFePHbzgF0Qo3pVkeen8ANeQOx8si0KCiIEc033AZup+NRXt/wqs1emeiYCwdVCJNTbUWHGyCxyZzgQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 475e5ece-2a23-4359-250b-08d9884245c4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Oct 2021 20:54:07.1796 (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: AM7PR03MB6184 Subject: [FFmpeg-devel] [PATCH 8/8] avfilter/vf_thumbnail_cuda: Reindent after the previous commit 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: DzfMEIHT5OHJ Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_thumbnail_cuda.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_thumbnail_cuda.c b/libavfilter/vf_thumbnail_cuda.c index 7c86203227..c8dd905123 100644 --- a/libavfilter/vf_thumbnail_cuda.c +++ b/libavfilter/vf_thumbnail_cuda.c @@ -304,27 +304,26 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) static av_cold void uninit(AVFilterContext *ctx) { - int i; ThumbnailCudaContext *s = ctx->priv; if (s->hwctx) { - CudaFunctions *cu = s->hwctx->internal->cuda_dl; + CudaFunctions *cu = s->hwctx->internal->cuda_dl; - if (s->data) { - CHECK_CU(cu->cuMemFree(s->data)); - s->data = 0; - } + if (s->data) { + CHECK_CU(cu->cuMemFree(s->data)); + s->data = 0; + } - if (s->cu_module) { - CHECK_CU(cu->cuModuleUnload(s->cu_module)); - s->cu_module = NULL; - } + if (s->cu_module) { + CHECK_CU(cu->cuModuleUnload(s->cu_module)); + s->cu_module = NULL; + } } if (s->frames) { - for (i = 0; i < s->n_frames && s->frames[i].buf; i++) - av_frame_free(&s->frames[i].buf); - av_freep(&s->frames); + for (int i = 0; i < s->n_frames && s->frames[i].buf; i++) + av_frame_free(&s->frames[i].buf); + av_freep(&s->frames); } }