From patchwork Tue Oct 5 20:50:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30911 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp5773718iob; Tue, 5 Oct 2021 13:51:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEjieCoiOI6OLPCxnocvdVv2u6v/urTT1rOaV6bloABE/FrYhPB1l+gsCaA+pETDOX1QvG X-Received: by 2002:a17:906:3283:: with SMTP id 3mr27134448ejw.4.1633467087585; Tue, 05 Oct 2021 13:51:27 -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 w15si2478570edl.93.2021.10.05.13.51.26; Tue, 05 Oct 2021 13:51:27 -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=MP9yQirB; 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 0B5D768A874; Tue, 5 Oct 2021 23:51:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064043.outbound.protection.outlook.com [40.92.64.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 46A5D68A767 for ; Tue, 5 Oct 2021 23:51:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T6Ca/+UBSqTpN+a0GAgs+FY0yO2f5Uilaru1/9btxLPlVUcx+M4DIpigusVuWwnIawLLA+GOEbNlb7q7Cy8TEVM2i91WTtvd8/G728x1oNGCfkPn7z2TPcOJw3oIQOAfIeQWkr7yRL+4SE1KXx1wyDFQYIvoYdKPQ+O2x6IftSEFKa/Nf6DEB5SmToynrDKnUl2dkZ5Y8tdt7DTPD7QomtzEfmCB7Aunrb0WJIXTBbKOtqr//bk5L0ERCaZDUR7NwvYAncMEmwDOJq68A70r7qQF5JDQcag1L9z27gZfDqU90GD4w8lQJpz3BOZyZfkUDI1VZi44gcnc2F35tfwOdg== 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=1y2RI10C/0PlaRYPopYK7l782AwN7PoTZFDyKO45UUI=; b=d6Pi4zPmR5A0+gv9AfgEjqtRhXP0Y3Ios+gXx1eTOM+l7Fa6K+yrr/2+3Up1R4TfWS+zqyEWm4C7kc8/uYsy3sCoQ/X7bikUqSlhJOKhhrDRGtXVqD4/kplTEyCuviYkOj/L8rzrZtVZtgoOwVnSTbwbG7iqkqaig4G5EtxblbYHVTM2WH44RArTJsk4cIamzpyAohlQYgC/HZ8KLsiJgWZmzUBF59rjvmcjZ1KD+m8VsjHsMb2p4WYV+MUDv7XsuW4TaKLWbDNhb3eptHO3HNgY0bTgwYODYRAQBE0T2jBbj4200V1O///WAN/8aSSMeUDwLbj0nhBCfk7b6LyEMA== 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=1y2RI10C/0PlaRYPopYK7l782AwN7PoTZFDyKO45UUI=; b=MP9yQirBrO0yl0igfgHQaNr7LF32J7561MEC8rW3MOGJA4JxevugHZ20h+pqAkmwElZ31aY2kA5/dXdWx8riypGhIHd+nsPtGql2+NVzzUTYOMsNH2oJLU5M+2R8TB1fKTmOTHsFIL8WM8Y6JhrwrIpwXMTJtqN+FD8RnB3MS2TbZMBGyxvg9ddFTrB1e3OMPrvGeddMQbg4F7lwmgq2b8IMvxe7jID/G6esPZWlL/wUnWMtwr9zYSblS31Iqub+oZFUS5JRf4fkfAxXrt8EUmKcg5H2NNdjQBzmMZ9OllIaoSXNb2oHSym3fuHbfdndnoaVtIG8ucxop3Pk5j/f3A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4824.eurprd03.prod.outlook.com (2603:10a6:20b:84::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.22; Tue, 5 Oct 2021 20:51:13 +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:51:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Oct 2021 22:50:55 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [YdYzK0j0R52uoZ+2wtSZPds+AUjylY9P] X-ClientProxiedBy: AM3PR07CA0132.eurprd07.prod.outlook.com (2603:10a6:207:8::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211005205102.519815-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM3PR07CA0132.eurprd07.prod.outlook.com (2603:10a6:207:8::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.11 via Frontend Transport; Tue, 5 Oct 2021 20:51:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2ddcce1f-e1f5-4043-bf4e-08d98841ddb0 X-MS-Exchange-SLBlob-MailProps: EpEO96k6WokY/mv56J80DP/THPsZHp4Z9/776o1W+4KAoWxIpl95nfnxsuS2AxiJQvfu/6HKNcJe+/4VdAzQk9jp66HKfxaS49i3gY0GJh69T9mvxdMGKp/T5KW10VCHI5BQGe+RO948KB0BqLmx3EXaCcz8qVojPLENyCVee/vAwnde9bYx4HRIi50CEOvLGWIm1A8ZXhVW/sKG1wolWq1xVUracu4fc2S8N2Vtp/QtY19qN+kyze9XGxPI1x8wzJtYg6YsJxwIql9/4sM+wwurZnJqoVm1oLWPlGfJRda5pvuuVSrA4wXOZrF8cDps8KhdyNhjvtzeTlLZC5NNZoqWozae3S+564xj6xEptvPJa6LW1W+6f/U7IRsDbspAQCm5oceEzxe9ZO6TMTpxAz6qq9od9Z4j7Vp4HtJHjHvAvKOQpm+nqyWM2tPKb8aBwi47NShy6w1+WmQtvY6qItR/W/IPMcmQRmM0XCsUMsi+jRHeP0nGKEoFpr/SQtgy8tL0yXqUXj3FMqpuknwhQx7Y1JclLEQ3DSwu3WejMuvGaMNQ3TeBEbB+PP3/kccWb/ArxRbPnwG4N40FniK6iM6q3xQEi8QwnLmZm/WwLfX+PIYGjC2UTtx3Zt8hfqY5Sr8G+IjzZPxMYy4N/LCpNzZPT6PqlE1/JC8K3RawCWTWXRjhk2UfWdLWbhZkwiUNukKiTFfXvX6e6ZXA89BdHPBqkpVyzcees7qzoB0uSEhOB+VzLcF66XLkd2PmXB33yFS+r5XablA= X-MS-TrafficTypeDiagnostic: AM6PR03MB4824: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EuWU5Nrbc6Qrm03M3tZ2C1yEvIswKW9XserQHm5Xr/VgdQrrty1rtwC1bcIM12dj9UPodNnBWQ0qxs2qaQs6majtLhNCMo/3W4J4wjEi+6duneLP9VT3w7IKA0AmTgK3S8Lkk1ZdBYAVSQrt0zbVxKfynZdZo0XTpsKVKX9d1M8VeTjF3K2oLLxPlHhT03MZlR30vojmhCBWHnZfsnD5/WksvcAn6n+lyvG8CHsjIh0GMvH3+AaRlLZ3Jvlz96C5QC7kCPvIzaCSTJcqPfvOWXAYbYIDiU03ZPsaTIN/TewSW26BqENUMikB3VqmoeUDfaorG7Fd2bYYtCV/xKMFS6LgExDHXwS9UIujPi3K6iNh0bfJTqYABnvS6q1EoWKo7L2ZBWiDdEw7VlhTQ4sWewOFOsHaYwz2u1IGjfrVguJHNtGLSCtJPhXlE9/kGQLU X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: quPnlalltZHllY9HrvvzsCwPkqE3/yOZwA3q0bRL0lH5tb6xzhVxmjdPzZryEyPe0zrYWGH2iwtgKanbMcyG+sgZWxTxpyTQ97wc6ZE0lrKldxWiG28Tfh70gFFg6gSADjeqSg/mQUWUiaZHh72WRA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ddcce1f-e1f5-4043-bf4e-08d98841ddb0 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:51:13.5641 (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: AM6PR03MB4824 Subject: [FFmpeg-devel] [PATCH 1/8] avfilter/tests/filtfmts: Replace macro by ordinary function 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: wsUNLqXqBxaS This is possible now that AVFilterFormatsConfig exists. Signed-off-by: Andreas Rheinhardt --- libavfilter/tests/filtfmts.c | 77 ++++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 35 deletions(-) diff --git a/libavfilter/tests/filtfmts.c b/libavfilter/tests/filtfmts.c index 55bb64abc5..07e387b92e 100644 --- a/libavfilter/tests/filtfmts.c +++ b/libavfilter/tests/filtfmts.c @@ -32,43 +32,50 @@ #include "libavfilter/formats.h" #include "libavfilter/internal.h" +static void print_formats_internal(AVFilterLink **links, const AVFilterPad *pads, + unsigned nb, size_t fmts_cfg_offset, + const char *inout_string) +{ + for (unsigned i = 0; i < nb; i++) { + const AVFilterLink *const link = links[i]; + const AVFilterFormatsConfig *const cfg = (AVFilterFormatsConfig*)((const char*)link + fmts_cfg_offset); + const char *pad_name = avfilter_pad_get_name(pads, i); + + if (link->type == AVMEDIA_TYPE_VIDEO) { + const AVFilterFormats *const fmts = cfg->formats; + for (unsigned j = 0; j < fmts->nb_formats; j++) { + printf("%s[%u] %s: fmt:%s\n", + inout_string, i, pad_name, + av_get_pix_fmt_name(fmts->formats[j])); + } + } else if (link->type == AVMEDIA_TYPE_AUDIO) { + const AVFilterFormats *const fmts = cfg->formats; + const AVFilterChannelLayouts *const layouts = cfg->channel_layouts; + + for (unsigned j = 0; j < fmts->nb_formats; j++) + printf("%s[%u] %s: fmt:%s\n", + inout_string, i, pad_name, + av_get_sample_fmt_name(fmts->formats[j])); + + for (unsigned j = 0; j < layouts->nb_channel_layouts; j++) { + char buf[256]; + av_get_channel_layout_string(buf, sizeof(buf), -1, + layouts->channel_layouts[j]); + printf("%s[%u] %s: chlayout:%s\n", + inout_string, i, pad_name, buf); + } + } + } +} + static void print_formats(AVFilterContext *filter_ctx) { - int i, j; - -#define PRINT_FMTS(inout, outin, INOUT) \ - for (i = 0; i < filter_ctx->nb_##inout##puts; i++) { \ - if (filter_ctx->inout##puts[i]->type == AVMEDIA_TYPE_VIDEO) { \ - AVFilterFormats *fmts = \ - filter_ctx->inout##puts[i]->outin##cfg.formats; \ - for (j = 0; j < fmts->nb_formats; j++) \ - if(av_get_pix_fmt_name(fmts->formats[j])) \ - printf(#INOUT "PUT[%d] %s: fmt:%s\n", \ - i, avfilter_pad_get_name(filter_ctx->inout##put_pads, i), \ - av_get_pix_fmt_name(fmts->formats[j])); \ - } else if (filter_ctx->inout##puts[i]->type == AVMEDIA_TYPE_AUDIO) { \ - AVFilterFormats *fmts; \ - AVFilterChannelLayouts *layouts; \ - \ - fmts = filter_ctx->inout##puts[i]->outin##cfg.formats; \ - for (j = 0; j < fmts->nb_formats; j++) \ - printf(#INOUT "PUT[%d] %s: fmt:%s\n", \ - i, avfilter_pad_get_name(filter_ctx->inout##put_pads, i), \ - av_get_sample_fmt_name(fmts->formats[j])); \ - \ - layouts = filter_ctx->inout##puts[i]->outin##cfg.channel_layouts; \ - for (j = 0; j < layouts->nb_channel_layouts; j++) { \ - char buf[256]; \ - av_get_channel_layout_string(buf, sizeof(buf), -1, \ - layouts->channel_layouts[j]); \ - printf(#INOUT "PUT[%d] %s: chlayout:%s\n", \ - i, avfilter_pad_get_name(filter_ctx->inout##put_pads, i), buf); \ - } \ - } \ - } \ - - PRINT_FMTS(in, out, IN); - PRINT_FMTS(out, in, OUT); + print_formats_internal(filter_ctx->inputs, filter_ctx->input_pads, + filter_ctx->nb_inputs, + offsetof(AVFilterLink, outcfg), "INPUT"); + print_formats_internal(filter_ctx->outputs, filter_ctx->output_pads, + filter_ctx->nb_outputs, + offsetof(AVFilterLink, incfg), "OUTPUT"); } int main(int argc, char **argv) From patchwork Tue Oct 5 20:53:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30909 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp5775913iob; Tue, 5 Oct 2021 13:54:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0W+2YFUjLML9sVlA/k6WZ0BfSFA1BW+QK8vXQfLg39GGwP8GqXU/2gAkOlRIVxCQ3KKVN X-Received: by 2002:a50:9d4f:: with SMTP id j15mr29588114edk.68.1633467246792; Tue, 05 Oct 2021 13:54: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 hc43si10227493ejc.721.2021.10.05.13.54.06; Tue, 05 Oct 2021 13:54: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=WMlUKBej; 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 552F368A1C3; Tue, 5 Oct 2021 23:54:04 +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 0639968A1C3 for ; Tue, 5 Oct 2021 23:53:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z30fAgBR+qHqmohZ6OEy6oftKZlS9EuwgRYw/eo7vNLGUUTIUN/mN3XCUFwf7ZKpDxj9Yq7ScqqE0avjY9omuCRVrBEOqZL4IZWwfAZw3I1BKFWh+HtUjWF6+3spHYGwdKiruvyEGOtnbzDv7Rnc+4QljKqEMefrVYBQ82DbB5wpu4k+0lg6o3CYs1P5PX4KxYCTTcbAdL63hq2NLkCHJFkuQrpxhZSpB0BYfNfWu62IluODf8RdMUL48URLfpni+nh5bpQvTPXeiPx6C3UALnrnzrE33xdwcRs38ChQLkd0dVLKjC0nwns52o9pZ+r3XXzwd2tUZ2wxwG1u+W6u7w== 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=odJMw4i4qQrEcYeukhWP8f9re2l+1PR4nHvvXoPRgRU=; b=DHg5R7NZ5hxfoPDSih8GCBwA1xYwo+X+cswMR+i+9QhxIy2sITGAeMdS2GY+OAA80rSqvu6jdgG6heXNppqY/rWFh84aZXkgWbQxPOe4drgigiJhEmZVvDuua2kvOke1PZ8x+MiVLFiKY/bFzWIkz/ahseuDLezLO80cJtv5taJEmSKfsVHuz27t5akiFoXjMtwIFITUs9q88n4H/gngL2fHjX9EeCih6pkiBqMR+pOycSiM6cqaRqHDiJEGOopWA2Zu6Lh3Fn93v+k4jxJ63mmhbIZHgZSVNdAn+ywA9828Ocj0MSPWxj1t8gz0OrYVdF2lYyCCLPOH4J4kTC9agA== 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=odJMw4i4qQrEcYeukhWP8f9re2l+1PR4nHvvXoPRgRU=; b=WMlUKBejO74q8L3eFtoew9NU0QtjcXWjkL+3SJO3dnVluC2LxJFKf2GLGxuEh9kFu2xwzRD7iJMaSb87bQJ6L5M+kkuyHpWrJz3hY20MePR6u4sBzpn+5r44rz5JIGdRP7CLDYgH8MbMebQatis/Uo7JD00e76wDnvVsGQsOOdKqZoPC3SiuJVPIRspdK0J5pCJiKpPQQHI45F6Hyo6k1fSDgm/YwObV825sY4Loqk+SlO982bbG/x8gNuCHb6skZ3kLG+VNiMuylxx5Mzm6s6H36BB6zYXPiH/H1VzGd0RXB3B2E15kquEBF6F7o2eZpEp11z/DUejqwibQ2ph5Jw== 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:53:56 +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:53:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Oct 2021 22:53:42 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [UiRQ2R0WjezCVKFn0OEoIvVMc3gGkEO9] 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-1-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:53:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e3838008-11f7-4fe0-0fbc-08d988423f7a X-MS-Exchange-SLBlob-MailProps: pxu8rxgqUghlTithzvW/6FEzw2ePNXnJLXEI4SXOkafqMx0hcgoOiATb+sHGg4ZtBeYnFksY7gFHOgwvXqBRNAISs/GTC7aW4ClKEJXvQhfttFO8DBFozcfP+SGaz7rulglksnMgNJApZg0gOy+WiSjHk+8IaooDhTy0zH7gWAmBqmJIfs4M7iTSjaHcvTXXGScMST7yg6Pjigm732jxI9l34GB90focnGRPZQJIdmXfrlPBMKlzHCSYyhSb+nPNTvadGzj4JOsc8Fo1tcMPJNzw4GtHb5Y+y9e2c0BvVMSiya6gWyDeeGvBv9i5m4FDXiuQ4WoQJnaPUONxbA7whPLl1fHkpmjiLtwLHLp1/bPZRpLcXHAevhgwKMkcTdR1Iz2Fkxbn7GQ1YYtyDJIRMSitH+++JHdr6pJLEmuGN+P4/Oxa3B+dwRxQPeB5YcJbycbD6K8XECNHgA1/irjUlR0kzmIUWjKnoHQfJyRyV1SxcXsjQWq9P+fwoXJd5HjFxDVGhyNK5ljWUx5gMEzIBButwp56YbBWUkR6JMRhg3fEizP/VSDBQb8fVlJr9b7LkS27cFa2WPjvrQVaJXnpL7/FYhywwGlBQ6TnNpDwECXxLkarr2GSh8FPPWIbcBRt9K0GMW7AyUQFtkAu4i3CrgZgdGdFoYUWk8xqNvhSnZ1D1iBfTsoYh7yxWIhIqc/3I4W0sGtc9wG0dvmDmSqT4w== X-MS-TrafficTypeDiagnostic: AM7PR03MB6184: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DyE4FMKNmJGE/lUpt6cDoms9i4R4F52TJf1yMsu2arB5DoKKsMRveDH+mzhUFRtPQOfkaxwIkC53MK+xdV57oFkKcwf2FTj1nf3PHqDvVFdalgMxx1tgMGjrvUvsz3EkPPdWSEV5zBFNbqotWutkiDiOCquN3mIHo0gjjocNnqeTpm3m0DcGtai3DURKVQuHxArhKeDnGwVXdaSBqtAUB0Ybx6dZeCFERrrRnlG/9vsmr+pYP73SUShNXaUJ1/DBCljV2euaTavBgMRXpGM/3PbAcnGYAtKhKGoqkaOAQuu8Bcbb5vXb+etu/ObBtq69FP3hFZa1t6B3TwtL9ZXV9oMxqQ47qGim1vsqULWaRMtNqyUD4R0hYHGvucBuZ1ii+Dq8xUe5a/7I8mZFh6ZM2Kn2FovjzeTE6SL2bpt3CNrfOcCbDgwW2zmz7J1EKWHf X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OLlpuRR1bxTI5EGaiEUeFGXhkt1F1T7NoBD2/IY/o1EYTNuqnnFT3RBMSoNoALJ7hjDqXqSL0Alehhm+u5pvnxRcI069uui2MHkSb2PfiFq38HRSQCVfkWyWqubviiVXi9FEaj27OjlwMydRaucNFw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e3838008-11f7-4fe0-0fbc-08d988423f7a 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:53:56.7602 (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 2/8] examples/remuxing: Fix use of uninitialized value 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: w76hwNyfz2x9 Fixes Coverity ticket 1492326. Regression since 53f374c08d5cc97158c17ea34b1c8ee0116c0578. Signed-off-by: Andreas Rheinhardt --- Sorry for this. doc/examples/remuxing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/examples/remuxing.c b/doc/examples/remuxing.c index 9ffffded91..2657f9dc66 100644 --- a/doc/examples/remuxing.c +++ b/doc/examples/remuxing.c @@ -68,7 +68,7 @@ int main(int argc, char **argv) pkt = av_packet_alloc(); if (!pkt) { fprintf(stderr, "Could not allocate AVPacket\n"); - goto end; + return 1; } if ((ret = avformat_open_input(&ifmt_ctx, in_filename, 0, 0)) < 0) { From patchwork Tue Oct 5 20:53:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30907 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp5776063iob; Tue, 5 Oct 2021 13:54:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyII8TYyiw0+13vRKuNU2x4Je8FhAKuvqW1DBDWwPJD1o1PWFzYfjK7t4YEtc0cd71zd5RH X-Received: by 2002:a50:bf4a:: with SMTP id g10mr29160804edk.11.1633467255641; Tue, 05 Oct 2021 13:54:15 -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 10si23126045ejw.91.2021.10.05.13.54.15; Tue, 05 Oct 2021 13:54:15 -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=eqYvL9VL; 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 67BDD68A767; Tue, 5 Oct 2021 23:54:09 +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 1C73E68A767 for ; Tue, 5 Oct 2021 23:54:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jucs3c7qhguhJi/2yDtEh0jgQ5rniTeIbl29WY5MUFyYwwfibAUWPIQ7xU7GUP+9uPXDWspIgeFNlSmct69Jio02okLEMOqousrGucShCJIrjRR11K9MxX0OWxNs6W2hEuXG9Kqa0OVJoODORv1rbpB1tFSyCOD/sSfbaumEvSmz2T7roYCqL3em0Gwkc2ihAqdDotGKhg43QB79b6dG3acdjdiRXip1+ZtcfM7M301Ijh7wMEwBOIt52YWqnIyCgdUMzbaNpYDsB8pBIz5Bfu5SedR5GJcbCxqXBKzg3t03ykTmlXpiIosAHcysTqOYzB/syjcj8ysmlrKR1x6JJw== 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=55g5pjBzLb7XDbo/crk9fgUp29Ych7+0+akZPXWW1kM=; b=NIt2nx8u92m8Rnrm9RCl3/Jh7e9RV/0sz3NZULGhac12FAwMu6t+fH7vFhVNnPaj1KCqVI2tHllkrQydkJTTRtmSrXP9tFxlJsmYiIjRdRros8eAE5tGonY6JnbME69xRyGzAlQRVGEFmKe9JKc64Y422x/DujgDityh8xv9QsKQUSSRDDkG72yG19BOAcp3MVaZzogdJHpGwbFPN/lP92n66MWek7GhHlws3ZMOjB708yiXnSulaL1XkroWVDhKh38I+C8VapeQEAEHe2gdE5DQ5MRnQUbcGz7cPmFxh8og5MOrP6cxzR/0nApjyC0b+W2f2dHNBVSqTQqKl0xiCw== 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=55g5pjBzLb7XDbo/crk9fgUp29Ych7+0+akZPXWW1kM=; b=eqYvL9VLx61BBpr8TBzdq7iDSGP9qHlSVxmBXKjtMat6MOWFiIVs7/UcJaRGSc3wlakVCQqbpqMo3M2WIQsTEfMUmRI+T3N3FaJV8In8iqD32DAHbMe2wTDvKrbn/uQC5iwNmHOIJa6s2BVuT6FT/ZOly3cbxcq+KVcLlph85badJMQuYRYyJhb1Nb3NL6C3cjqo+Z1ITLA8LMWe6/M5oxWzl9KyYIfgTSmpwv8MjbMM0P4rr5qGE49qankI8DrqEcMO0nbQZFdmopbiDz5Jb59bhQy0QNjtyeryIJbjenCcBuiIOsmPqNsl56vh3vOAIf5o/HYpnuc13MOzxwLFUw== 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:00 +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:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Oct 2021 22:53:43 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [KFKlYMQ1pR+5GWIGuiLwmUiRFc2ngpMh] 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-2-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:53:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fdee7e69-cb8e-44d6-1d34-08d98842415c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiS+KSxcjYi+gKEA6YP+MkHeIOMbM7bhHm0T3oFbw8Cs9U9UEyZP2AvysQU4GoClIa2NCesRfpX7upQ/sd+SqS60zSlhJKJQVmDLttDBTNzy2H3SHXGPr8x7gO1GWCwxe4ioj1qDxLNom3tNX3afK94ueoVw++BZOVj5x34WWmOJsFz7jKsPa7w9Evo8kwwE2Y3QPtHV50tkhyoHWPpJIf93z/pUGlCJ57y3RR00lhY2OmDrV+Oyng1zcdbcF4NGWa0s5YfNtseIrfr+VWEhl68ua6rTPYdv6Etw0W7hCchkMtbOSlR7uvKDQf70B2zMfXgUPetrN/GXD9kuo40If6KUg4+4wix/1Ib8ymD//PUSWRVMqd4qs9ZRPK/ipxGWmR8uu3S1TaH+H/IrtJD/L9RExGiOLglgD6/frJK4jASf4c9uonFFX3+ORTdjYR1pf2QgpW6wMDezwgJVU5/tBa3vCXcCSVhRUnk/Ngr0JvB3mfHj6Gatef8R41nsvAfw4GqCRzA3I89CVD5sZwM6I56of2uylfMHZ39SHT1wz87ZjHiWp2W0eKh97IpwHxEbRvS/OSKuB4xe3McChVbsplP8xuNs0w+UmAm45mm9e8zzPt9dEyTf0aTlULzOLPwG/1nrmq17BTh9D4fXH8x4C9lqMiPloCJyBrJmccvfrLDRnlfckUajcV+dU+6HBvwqSWiNInyvcewQjvfdk1EVSNI+4aI7WO6d8QbyLt9vCASfcL5cv0f+2eucOSj3QZwu9SY= X-MS-TrafficTypeDiagnostic: AM7PR03MB6184: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SFpHxLguX9mf2sscTeftBkj7QXljjy+O3VXeMRmfR+pUIWk67hDhdDzmbKhtsdaWVGsPGhF5QosS3EEyHaIlq5D+aXSogouZtwVSXRYZLrG/9tQGYqBxs/RHx6d7rgPffzP7lAHov+zXUzq1RP/aUHW/PmT5kMokXHp62opocqhJze8zjgJFQzSUWMezuvpKVy7NOv++GxA0iJO9HXHcHXGExVoBYe/EAroSOJN8i+uD6NWGYjdlYz1DBM2wgCdXFQFoIcW8PScAaa1xJoue5JD11yjLelk1JJL8kBmg3Gz/HujrtvOyrUDF7GwJSzFy3Pf8jhCVeknkkDpiE7q34Y9sU0AdlZD2cPfat9DBJ+TGh2Z5NC3NpY6OHI6z9i9UPlt1MVHltSEQq8JXMakJGvtsz1pkP+vfv+qqFGecCpheDnunO0O+UcsK6xjGr23Z X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: H8zoMPiC0/pFYF1AoeZwv1w40q0cs9GogsAu+flChhZ3PW0Hx8UTWtjCToRvVYt1ArBKZzaNqIsjkyLH0+SLhGFRAPx4JaM51esQ3eaOK7hWsxpWk+BPC47ploJhRHJ3EKgjidQQCCZQlrjb+4tRWQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fdee7e69-cb8e-44d6-1d34-08d98842415c 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:00.5088 (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 3/8] avfilter/vf_transpose: Don't call av_pix_fmt_desc_get() twice 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: I0PgprqTnRWG Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_transpose.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c index b0354b938f..f9f0d70cd5 100644 --- a/libavfilter/vf_transpose.c +++ b/libavfilter/vf_transpose.c @@ -55,10 +55,10 @@ typedef struct TransContext { static int query_formats(AVFilterContext *ctx) { AVFilterFormats *pix_fmts = NULL; + const AVPixFmtDescriptor *desc; int fmt, ret; - for (fmt = 0; av_pix_fmt_desc_get(fmt); fmt++) { - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt); + for (fmt = 0; desc = av_pix_fmt_desc_get(fmt); fmt++) { if (!(desc->flags & AV_PIX_FMT_FLAG_PAL || desc->flags & AV_PIX_FMT_FLAG_HWACCEL || desc->flags & AV_PIX_FMT_FLAG_BITSTREAM || From patchwork Tue Oct 5 20:53:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30906 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp5776218iob; Tue, 5 Oct 2021 13:54:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwR8RDf+7koWSdCzLnocooA/EqwqqU5jSmVdL1m5ymCWjLWx+GenSSRsePbx5IU4D3w+SmL X-Received: by 2002:a17:906:1406:: with SMTP id p6mr14092423ejc.16.1633467265551; Tue, 05 Oct 2021 13:54:25 -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 sb26si20127416ejb.542.2021.10.05.13.54.25; Tue, 05 Oct 2021 13:54:25 -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=VDcbNFPO; 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 7EF3768A9C0; Tue, 5 Oct 2021 23:54:14 +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 3256D68A874 for ; Tue, 5 Oct 2021 23:54:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LmLogRSCvA813qV86/KZkAMFEHCV8zw15FIX111uA6+imBfgi8rtthFDBxEndsdM+c2WL2Znhq3+VvMmMkA0GohM7g4GweHQAE3qGZu9TCusyUjxmz5MJBMOzVUPIQnMD9q0FUIh0IGqElid2jf69eI9xCZ7fuKdPly+zXCjh6hsomRol1OyWUYz6keOwvEETTV8yF/0tqAjYhq3K1ed8VFjvAXgDj3/yid33h9tm2pAs5Tj0cfDvEjWPcAnEXk5GbjczR//IkKH/6XKduLTnxGv+etjuolPEDqyIwroxpR+AV1V6jA6OPMwwvh1aBXWDbSeqrGtWCZQuz4X7cq2+g== 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=1FK/mg0MvqYjurETEPKZbZxPbkhSTY97nrLsIFdHSxo=; b=g9X664BEE84Qnc4TAAHJrtpD9EPHk+bRWnOgUjq7K6reuYeQlDHPAVos8KjDdXQV2p8wkCfAUuOVBlFv8901y5NKfkxFpY1lq0ksAzbSpmOB02/Oa1B48+5ilx4yq1YezXF3pFkOuIK6WY3kKYbRZM5/aD9PA3EqQplQv9UUaCoZ+tIO5h9hTxYrlBJQ/MfzJTwPUes+7TfDi2dEj6ESycQbIt15CRKigEwMbiBSoHZfb3tUpHgHBF1PhK/QpplbS/crBbe5UEmo+gHM+TdbjAIS0TnlmTi7x6mVphiqE3jILIY8uJ8kE+bxCys8LqiUhwSttUhLiXTAy2+I4VvXBQ== 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=1FK/mg0MvqYjurETEPKZbZxPbkhSTY97nrLsIFdHSxo=; b=VDcbNFPOfPu7eFnx1VjWplYH09ffU5UF9AjyoDkcCnDc+LB02mg9qYQgM/J+IgSde6B+HoHHG7RBl4k2QC4HgFrRKPYB/uUZVVG7SDCV7+TQdNnu3ddjK/hHsLPZlDJqoOFCpXr7aRb4szIthzydxC2yqYS9OzA4npNp/Ba1Om2qnngLvhJoMEqnpen4S70ItHxw4H9loTKH51JMTvfzRIzOjCuGS6K3dy5N1JaqAKZQ/lg4UQZY5SY92Y+vpvlsawMrJ+p7edJpMmASLEXLtDPwzd0xbdaINbTfMYZry1FYb1POZckJ7JLUMJfyCwWGZdatI1LQEEpqdgYtMS6AXg== 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:02 +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:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Oct 2021 22:53:44 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [GZuObuY8JFav7+5/+UnNcG5cowSPrsat] 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-3-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:01 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5d15c53b-c497-4112-1ce2-08d9884242db X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWB1e7ZiA30a0MuCttbMdtXDk3pYrvejSlj9NlxPxa1xXu9NsvrIEOBinda1Kdtut1O4pae9GXkG+Vxmuyp/qPbY8bYtubsgidSoUi/pXa1gJ2RrdPNJw0NnAncWuHWdKmOCttluj47Skmr6sVgwtIRQRtrZT9JSd2e2TnfFadggWq22RbVObhGSHL0aB5XlQRG+bWhWsg9/LRK+6WZauH3eVyw+zqtt6NhHjcJ79KaBUMQS5LyWe3n9BMuFhB0MuVGryGPipf0xA5MkMoSXhmFgWyRnS6iTTauN63BgT2SRxYwRgAZpoSpbSBHjj2ASPevw0aPMcTNVGxaTw/SIzZGIu7dWLoPfx3o8qp22qz0t2f3tuKcKtIo/zdgalsZKxG9hfu2H3xJC5UCy5+21tiH5/NLK2yadGx8FjGuiiANP9Vb8+yi+6PmHR5Hk6O9tJ6QUaUMDaVmrGx6w4q735JwHTPaAZVYZs7U0IJzykjY4TIMhatNTCb4JKJXyP9pqmrg7LgFd7HUCzuMpNPrPZLqpZ3RWiYlnAN5EZXW1vQ0nZAHBNPQKdvzVqdfbuUr6U8SK+yLdXuoqnR6Co42Pb9aB17nEHgpmg9N+36u2py8foJp1YCx0nZqVmfztkU9pYeuwGILxe0CQv2WJ+/4Dr7UbsVguIkiJ6oqGu9hwS86NY3QeFjNn/S1lKmKzL4rGuFQJvaIH3N8QCPlTRCy2ADRa2n+r2zy+0Q= X-MS-TrafficTypeDiagnostic: AM7PR03MB6184: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1Jj7Rp00jLKc0ROEQqIJEM/0wjQkv5eI73SgDsIQlJhbqD/rq+jJH4uLRSJxC4HK1Yuci2hdBhBabaMyh4TYpEn9ukzn4+UHYkf9aJaIPDk1/VLWUdw2vlVT83WTYR0GWXErJzoQlIT1SipOtrnJBLL2fVkn1B5uRdaqACcaR1BdTjrCtnKp/bUeQ0TelXxKuq6s/hqpLhAsZ1nM7g9TQ1nKL6+1/ceRJBWkmi1oBLKx5gRrMUgd/EcmUFJRkFHHxWr4wVdxvD9urQUmIaop6WqVGiF2KwRYY71OU/SV+IrFafON9Go8K2g4e3cj8CGNUxAJN0Ai/VwD0ZZqstXi++B94EQNC37THOpfEsc1AFycncSmXsQM3Qf301J39jQ/iIcGv1du3J8J5e0EEoAePdWI+nVDFmKBpXvTeOdUiFwYIEs2qoieAcJuudKPdL7+ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: P3gIj1vshIrvNsonRjgUxkJjhTJWXs79fIEa/2vujW0DXWShP6m0fWkA3lPxSBTtEDjez8z/8eOKVSGCffhMYqrbVoNtNb6RopfyPT6UvNi7aLhn5D0Sa5DO0W42fh5PB2P7hyV41gc/aYMJQVYTmQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d15c53b-c497-4112-1ce2-08d9884242db 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:02.2402 (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 4/8] avfilter/vf_scale: Remove always-true checks 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: YjN0ArL/kUjy Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_scale.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 5411289894..993fd18620 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -344,7 +344,6 @@ static int query_formats(AVFilterContext *ctx) enum AVPixelFormat pix_fmt; int ret; - if (ctx->inputs[0]) { const AVPixFmtDescriptor *desc = NULL; formats = NULL; while ((desc = av_pix_fmt_desc_next(desc))) { @@ -357,9 +356,8 @@ static int query_formats(AVFilterContext *ctx) } if ((ret = ff_formats_ref(formats, &ctx->inputs[0]->outcfg.formats)) < 0) return ret; - } - if (ctx->outputs[0]) { - const AVPixFmtDescriptor *desc = NULL; + + desc = NULL; formats = NULL; while ((desc = av_pix_fmt_desc_next(desc))) { pix_fmt = av_pix_fmt_desc_get_id(desc); @@ -371,7 +369,6 @@ static int query_formats(AVFilterContext *ctx) } if ((ret = ff_formats_ref(formats, &ctx->outputs[0]->incfg.formats)) < 0) return ret; - } return 0; } From patchwork Tue Oct 5 20:53:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30905 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp5776335iob; Tue, 5 Oct 2021 13:54:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzsO09J+J+lInpjg3/NazpBGjxjIrNysOmik65cPqWaFxD76bxxM7B2bbC85WBbSlQ2+Gbu X-Received: by 2002:a05:6402:5194:: with SMTP id q20mr28723802edd.245.1633467276355; Tue, 05 Oct 2021 13:54:36 -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 mp6si33686541ejc.384.2021.10.05.13.54.34; Tue, 05 Oct 2021 13:54:36 -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=q55CXZfL; 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 A968F68AA26; Tue, 5 Oct 2021 23:54:19 +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 4BF8568A9CA for ; Tue, 5 Oct 2021 23:54:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cHGEKCPxXZKfJuyw8HLdw7hRlCLxE/dks+pbWFkKWn0jYTcSEfzrID3YLi/BwOMF1TX88DfuCi/AjEvx7GVXxnnaUFiiewrvSx4677yoqM9RBONfz5MrU61QNy/lhLDsxJQIMOa9cvIzDxDQGKINWEyzqRM//LNozBy3OSuIEqrbXhXl06MIUlass+xgeceEmsLAiyKzJyd4R/hh2yyUfYX6tZaG1iJ5ethpuNcO5tkPtHDBcCLJAO5uLcvlkPu3X6oL6SNn8B4Y7Xj3TQGF/74/Rp6ImoIvJeTKXgAMzdN1JCvTQa9xyWQonGMmX8RrNnp7VWDNpgIvT2O/cTZigg== 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=wYgs6EEH+84iGS91gj/jwEKDAeIymc7zm0PV4F4ER94=; b=QvmShM5SdqcVLi/u9ietD/lx31THwzdEGKXzkQe+doWjXsj7hnwXbiFGyONdc13nj7y9n/djYWWqoeRpEgYdxWrVSjEwWgx4NlnLkOzQg8Jb0WAxcoXXOxH/FO9xxaCZm0yF5xjt5fv7jHCflsvFmV+qPgqtWGwNu52tTSgIdy1YLajADf5FXIl+RNz3s9IXGTha7b10bVc/DbZ5/ZtDV5pNXrh1kN8nbXkSc8mo0ID+IV3sw5Xuv56o2uAvs18k4aCNFl1EBWbDDxCay+fO6b3fbRZ2F+vQ6VlblTBd4ednuiHpSuwrHNtQzWoJd0my69dYCM6j7AEaueysy3L+lA== 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=wYgs6EEH+84iGS91gj/jwEKDAeIymc7zm0PV4F4ER94=; b=q55CXZfLCpNx+Hok0stII0aBEDTmTH8r+ud+Tbb1jgrJjpCJS4k5q/++GNU82MXd4SOulKpJfjTyIQXiJ9x5zn2H/hqY8mR3EmO9BfnWXpMAepqagK46/7lUmRWs/Qid0Idp/2jy9ruDHpxki/t3G5gHA5qGE7rvnEAoy2V6RCRxo2xvf3B1Ob2XIp0W6lrigPZcHtwFoMCmPeKzLoWGd+PTa6wFUeEItYTU8LEpbXaW6i/Nu1OsYBIqxF4QRd2GhiGxPPheQrN5v3IzPYSY7CyjU56aX8qDmsTdPvltLvSs8HhWl/k+InSDomXn1NAs9l9Er2LxI39yEpwnkmJYhQ== 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:03 +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:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Oct 2021 22:53:45 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [eBNg1CpDpjB+5HuoS+M3ekNUVDPNCNb1] 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-4-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:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fcffdf5e-ec65-475d-47cc-08d98842438a X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiS+KSxcjYi+gKEA6YP+MkHewkA9U743nFgooSScvIGDDKl3mbvz1oJLy0uEBAOHA2DFNT9gOd7y0niQNRNPhW8pjWXL9XQ0NQJAGuJIKEuTIn2KHi86N0iRn1l0/VkzckDBa5C2EXXEaGPIzdUdr/gX+NVxIR4hpXQ09RMxyL2RmvASo2d7Ys04DEzoFjlDx1NmV1XugKqm5AKTt2ukuDdmUmlrld7H9eXDBYo6dPXnq0n9cJoboXDr7z6Wj+DVouq2lMyoJk9Uk9LupSp08zjLJqNGG/YutRq/cw7COzvOFHqbz094Jj7AmNZcABVJL8y3azbBokrQOFhLwR3cyoU/OkCIy/mYyM5hHMN5z2jIH8CycNOXRnf+gY05WT3waY9HA7AASEWL1txuUVp3VXe1uXa+WciHuW0L3I/BIZEnKBwEuk1pzymWmVVhG9tR0n7zxAdB5JcwY7pjX0FK0FbWYZyziG/9LnJGjrivspGTKDazOgqNNjPASSK75c4DKPMYNSA1CLx8kYWcyXsmVrfZ4nu8La5rUUE5410ImHud39w/djilarcC3pf7Xg37Ye/npJEu75utK4tL9Km0Fzxmbyrd7m22QxqFtxtbOHIOK5xmAKw1RITVEVIES8p0gjy7gGuiprrOA6yWGoU7iHdzLz+wVrl6lRzAIUqk3M8/CFyuRujtA1XDbQrKINRaH4G1gxC/qKrHANXQZJo8nD0E9Ss6A0LjnYj6/hNSoY198o7nSbciGYTQH7NTC5VSQGI= X-MS-TrafficTypeDiagnostic: AM7PR03MB6184: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fDHLFqMiUiDJBZfEPgPf4Akag/fAYfj9mKO64geeECsC3MyEkI2hYF755nkSr+RGIl79i79efncPO4a9evRd0X2UKmnJFHhDaAevZgX0jADz1dqew0F94bxHNpSOOmJRtkWphKag6B+GGRCye85X64j4SNCL6CpgrkiEn6S7xLScH3GdoS3+ZUt6eEDJU+sL7o2tjFnw9DzWUXFWWsSBWkrH2zElc1YbXr3ihZmK0ka8oTtPcsu6di2tkf4ac6t+0qdPLji+itTb2I2w/yFw3MHTSUPWMUqUWGuZ+xLHqlWHqGyuUaVcz5WBF7hb1oBRTDHvF5aib3irf375en/WimpwVY8JiN9e396ruhUzaEccYwLT0hc+mMKdTVeYK3rBB7SeSzsbYzEo+KrktNEMOKX6xlUwhQIvyq56+gHENqa1oBmm6bSVg18ODkn+g3cl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4v0m2bwYyjOA6mU4Gw7SV3rGfZg6wytJGzkfFkwqLawC1UBLNpt7HHyap49rlwtPe8TSfqovlX+IKOzgvnw8AcDRfN1H5CWOIE38H+X+CgcTM5laFKD9rZdpBrvum48W7YN685vifWQZr6G8fNCueg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fcffdf5e-ec65-475d-47cc-08d98842438a 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:03.3982 (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 5/8] avfilter/vf_scale: Reindentation 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: sbHtAd7niH+8 Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_scale.c | 45 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 993fd18620..44f85cb019 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -341,34 +341,35 @@ static av_cold void uninit(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx) { AVFilterFormats *formats; + const AVPixFmtDescriptor *desc; enum AVPixelFormat pix_fmt; int ret; - const AVPixFmtDescriptor *desc = NULL; - formats = NULL; - while ((desc = av_pix_fmt_desc_next(desc))) { - pix_fmt = av_pix_fmt_desc_get_id(desc); - if ((sws_isSupportedInput(pix_fmt) || - sws_isSupportedEndiannessConversion(pix_fmt)) - && (ret = ff_add_format(&formats, pix_fmt)) < 0) { - return ret; - } - } - if ((ret = ff_formats_ref(formats, &ctx->inputs[0]->outcfg.formats)) < 0) + desc = NULL; + formats = NULL; + while ((desc = av_pix_fmt_desc_next(desc))) { + pix_fmt = av_pix_fmt_desc_get_id(desc); + if ((sws_isSupportedInput(pix_fmt) || + sws_isSupportedEndiannessConversion(pix_fmt)) + && (ret = ff_add_format(&formats, pix_fmt)) < 0) { return ret; - - desc = NULL; - formats = NULL; - while ((desc = av_pix_fmt_desc_next(desc))) { - pix_fmt = av_pix_fmt_desc_get_id(desc); - if ((sws_isSupportedOutput(pix_fmt) || pix_fmt == AV_PIX_FMT_PAL8 || - sws_isSupportedEndiannessConversion(pix_fmt)) - && (ret = ff_add_format(&formats, pix_fmt)) < 0) { - return ret; - } } - if ((ret = ff_formats_ref(formats, &ctx->outputs[0]->incfg.formats)) < 0) + } + if ((ret = ff_formats_ref(formats, &ctx->inputs[0]->outcfg.formats)) < 0) + return ret; + + desc = NULL; + formats = NULL; + while ((desc = av_pix_fmt_desc_next(desc))) { + pix_fmt = av_pix_fmt_desc_get_id(desc); + if ((sws_isSupportedOutput(pix_fmt) || pix_fmt == AV_PIX_FMT_PAL8 || + sws_isSupportedEndiannessConversion(pix_fmt)) + && (ret = ff_add_format(&formats, pix_fmt)) < 0) { return ret; + } + } + if ((ret = ff_formats_ref(formats, &ctx->outputs[0]->incfg.formats)) < 0) + return ret; return 0; } From patchwork Tue Oct 5 20:53:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30908 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp5776462iob; Tue, 5 Oct 2021 13:54:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwXoLBxmNdfpBsITbMX7YrCiZdArTQqmKZzAi/nCRi7GRWog7EGbrA2EtU3iyH+iwTZnK46 X-Received: by 2002:a50:bf08:: with SMTP id f8mr28004373edk.400.1633467285287; Tue, 05 Oct 2021 13:54:45 -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 nb20si4346695ejc.49.2021.10.05.13.54.44; Tue, 05 Oct 2021 13:54:45 -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=Lrq7GGvu; 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 DB82068AA1F; Tue, 5 Oct 2021 23:54:20 +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 6DF2068A9DB 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=E8jheW4hJmjlSoIgB8efLAxdo6PUSh44IeulPhM/mI5ZNHGOrAQHQN15/8OGaT+Varf51SH2oAmriaOKlua4etdfVmiiluY8Z4oRbrESKuyKscle+BWclgIk5qYzIANSHisQccHPjXGlR/yRau0sCXRYtm19qcWN6Ijo/Od1zsY8aTwKFHpS3j4o2DHF49w58dCm+Xyo8ADEwLiviHdYbTHZsj42VwoxIxkKwSTZcipKFvX1eOn4+lrqwvAsp3a0O13egma0rcztrZBZlz/S1+qcjuECDex1qUo7nk21XyfXzZa3ii/3L9qSnZm/Dupr83xs6+AOljviJcF2ThtGJg== 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=cCghutlTb71byMm9+GhDJibKZT9aGeNG5noG4IA1w/I=; b=gRMOFaQg4CE9jAG8hl9mCQAyKI6LU/3xpZTBCABAbwk9rZKHxEJH4ZxarIzQ71jcpcY5+1TL4lSH3OzHpmKJpMt+gN28Lbg4MFIsEA40Iq1H+0swffzwp8pwBX3oZi8ajT8CxK3QesxJuNm+VGWSpM2JbYVW3BNMF9YGGsTrdSWUe7fNaAPOgaqE0uugVSdcdtEsp15S//1Lk0Wqu4HCSyhH0QV81nP+5OsU1r/SfLSo9bcb4eHMlex/keWG0uPSa/5cqSudvtn+DUCjlUS6Qsq01/THowBmJRM6uH5aGzXzXL/soxMlcZG+Z4rGVDBjIjlXrHxygqYv2dJjDFJEWQ== 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=cCghutlTb71byMm9+GhDJibKZT9aGeNG5noG4IA1w/I=; b=Lrq7GGvuxZhD99nAuEmLzxMfC9y19zoZFsd1KeFUzEib0vnR9IYTwTKndJNt0rHZXxgG7jyIBRoU0YMKJdDLU3ymcW8lV9PBYBbWlBTQW91jtQej1rC176S8ggde43W+qyH9BXTxjOJY69ZDFHpqtB1H/kTP4BZ1xSV8iThVfsPwpwfa1KzIiyzz8Utu6tAyaijzbP9coCdNFJq+E6hPclTvDynpfm1zFpJeJ/oeLEvDkZbnpD6ZkWNUiFVHV95DZRYm+hBptN4xX5IfBewk1TcK5rSc1Zos7zfnHBvX2DJiGvUvZtbrsCW+yCBLzGwu8BXhfvaLqoNwpEfgTxIBBA== 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:04 +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:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Oct 2021 22:53:46 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [6VjTEmkl5uNewItGjriptQRMCMQXoCx8] 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-5-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:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5146e3e8-5dd2-4063-e6ec-08d98842442d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiS+KSxcjYi+gKEA6YP+MkHetSeyfcSE4HhNSlC/jcFcMUIHXEDhoxZwJGjZrnq7vmnickG21HLyG/otm3vZvKtbJyQLMoz08PZyGEs4opEZUVX+relb6IRGbqHdHArQuXTB7g8+OOt+9WuC3pOrfrbLbo354CBVT8YuT5XXmaRzSIBGSaVwOoLdKC0/WABJtHO7DfOmsAA2FkzcuUPLaaE8Y6dji5EHNXik5vD5NQD8airc8TK5glxLKuvUvhVLBUtyikU/ja/jTxrTU6A3/8APbfRL+eDPntPB2vjP0NydZJghOKPSJh8vT0iwehK4Lyx8+WmYsmpD9pTPEAgafaJln+wSvRkTauqh0wbRww/LUam8iJfWWZMoM8GDEJaGdFWz4iQI/mo8IaW4XvdY71YwCmTwdjxkUSYHWx5wNSX/s1c8acBlNOdml9fWgAZX+iR86P7hIiqXx4OiL/WV4OleRLLq9mgzIjIiVmHjbXvJoh5n0qPOwYXJ+ydmSiBFhrR4SiCF3rdrUe1uZCM2ZqCmm2EYniFz35VDQTV7iXw64zo3q9DpiFP85CsoRIoF+27QR4iriCAqStdDH0QkT62wszLS75XzzKn2Z5HTTqP5ihxubay+ESkqqgEqykGFNOHUumNsclQlxrjJmKbVkunJq3ZieY9w1aOH8QjKXqEwkNSj8ugZi3QZNMEIMxQXiu5AxonLJcP1cFqBP8k7FHkHJGTtCA2dqKocO9lmoy7v/9w3mr3T4gw9SHcmWFvB0mw= X-MS-TrafficTypeDiagnostic: AM7PR03MB6184: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T6Q2YazLN1n46/W6VjvpAzIb0AYW0r7td3gAL856PRy8nqdnHNplQua75NmsSBBc+MA+0AHgthfsWlsDVy3Q1KYKKTC/ewBrIJmuLDK+CgobCp9oN4wBqxk7T8FaNkjUkhzW+8B0gLM6Ctimb+DuV6wwI5ZJ+daaiwTbozK4qAavFSbT+ORgNPOmxsiQlZlrDI06PMJrL2YyBP2Wz8Zd69ek4ITUaRrtEXB5MsPG2URfxHWIMZJS58tpbU4sr4MZl9+yTRVpnTiQbDt1Hu1z2/wGDZRtdZLTqkDh5uBnV8WTAuDP5ZWbm2zo+WgN+9+LZXpA+vK/QM2cc+j4Bx3luhWhGXSrmbCYGE+oTOod6lVK5WfhSrMC1YS76AhUoLCO0+1UhpVoUOGy20PS8ov4MD/vQnLk7GnD3atTpyb5BAb0KgjSDYsluKfqH5bVAPnj X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EZ3gDLXWz2gRFFmthQCYMPK1/0zUZHd04WfdxGCoRRgMWzYqA0wJS6v+VpuIlGPsUM/cUqI+o2iVGAVLkRJ/ffdD/k0sz6FtoWUMPBKPjQ2SrTWxp2eW61jEwdhgD7UpHGOKG1y1cZuCFJD9pqrqlQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5146e3e8-5dd2-4063-e6ec-08d98842442d 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:04.4555 (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 6/8] avfilter/tests/filtfmts: Check for existence of formats/channel layouts 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: WyA/9Dvn8u2J Fixes segfaults with filters that either return AVERROR(EAGAIN) (or another error) or that do not set everything and rely on filter_query_formats() to set the rest. Signed-off-by: Andreas Rheinhardt --- libavfilter/tests/filtfmts.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/tests/filtfmts.c b/libavfilter/tests/filtfmts.c index 07e387b92e..d793480344 100644 --- a/libavfilter/tests/filtfmts.c +++ b/libavfilter/tests/filtfmts.c @@ -43,7 +43,7 @@ static void print_formats_internal(AVFilterLink **links, const AVFilterPad *pads if (link->type == AVMEDIA_TYPE_VIDEO) { const AVFilterFormats *const fmts = cfg->formats; - for (unsigned j = 0; j < fmts->nb_formats; j++) { + for (unsigned j = 0; fmts && j < fmts->nb_formats; j++) { printf("%s[%u] %s: fmt:%s\n", inout_string, i, pad_name, av_get_pix_fmt_name(fmts->formats[j])); @@ -52,12 +52,12 @@ static void print_formats_internal(AVFilterLink **links, const AVFilterPad *pads const AVFilterFormats *const fmts = cfg->formats; const AVFilterChannelLayouts *const layouts = cfg->channel_layouts; - for (unsigned j = 0; j < fmts->nb_formats; j++) + for (unsigned j = 0; fmts && j < fmts->nb_formats; j++) printf("%s[%u] %s: fmt:%s\n", inout_string, i, pad_name, av_get_sample_fmt_name(fmts->formats[j])); - for (unsigned j = 0; j < layouts->nb_channel_layouts; j++) { + for (unsigned j = 0; layouts && j < layouts->nb_channel_layouts; j++) { char buf[256]; av_get_channel_layout_string(buf, sizeof(buf), -1, layouts->channel_layouts[j]); From patchwork Tue Oct 5 20:53:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30912 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp5776553iob; Tue, 5 Oct 2021 13:54:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzvxfUluphq4Zd7G7C49UFw5KOsRLYWuf0q5FT+jcSp+YI/0tkTf8NgEK77bxSzrM/5ZvSr X-Received: by 2002:a17:906:660b:: with SMTP id b11mr27243219ejp.427.1633467295717; Tue, 05 Oct 2021 13:54:55 -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 z7si6256936ejn.598.2021.10.05.13.54.55; Tue, 05 Oct 2021 13:54:55 -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=SK5itRTC; 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 DD87B68AA49; Tue, 5 Oct 2021 23:54:21 +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 845EC68A9D3 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=K44z15+yuSdFYTI6CRYFgzkrn0/mMyM837RNyhYMWo0erad6iwWFSAw20szmwbuxsmUO9rrQItjiw6Z+ruCITbqj+v7CQ8Q4fhCsdoZguJL1bEUhDGNrDb0HitNQHLxCKsg9IeUfGth9AU2QcwQ6Qpqnzg69v+IXB2UTFbjFm/8xV+HRaDgxb7Akx8CmO8DPgr+61fDtvp2RytoE1uCdgG7MrHhGbIfUla7KMxnG6tELWfCHMWg1uLGDwGRjxJc0nNxEv9x0LugLr5jQeyEjK+Gy6DoRzyxe9+TSvU7SgDfhXLaXguWkrFb1L3bhDgmwh/fE5/BBDscDs2gKcHqZBQ== 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=ux+FTowt/nL85N6JrFMuVKf0A0T2eYIn4E01IZ1vByg=; b=jMCGekrkQDEPPO8O4GdohfCyhz5vTI6fPm7q+XqRziL6952+uJoi/QFOhY1d8Vw+GD4O4FKyVbPwDkPFN7+BuBnzJMSvb3QPs6LNvugEr9tV4vefK67+Ft2tGncy7G6TUlQLHmVdBrZH/UNlLL8K+Qne2uJtk3c73GMK6givp6RAghHmLbF7CN+YNSFuS6DEJ/LBJRTyi3Z3SldnxFG3Q4sYwmWDBpZ3mEUIM+QjbEIP3g+LIDJwqZ/OvEljZclxYff/fPAngvGVTYH2IZxxAExHmkV3q4LGK4BCMFkn8HTd1hlb7Ad5Uyw5tz8MShRTNUDvNXN6G4wemIe4dhePoA== 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=ux+FTowt/nL85N6JrFMuVKf0A0T2eYIn4E01IZ1vByg=; b=SK5itRTCGHkQDZACMHNbbVGN1ii4Cduyn8c67OUGHpQGFMcBf6aUc6CmwTerWUTPiz3I3sJy6Yd8RIHG4NqxEje+tJ+Zr5i3keYhI1p9p7xlj+FvTXc4fJ6YEToFYOcJuytf++xyITW7fC2BA3m5mh8nF8u0pgN+0ZqhbMGCe9/tFnuNPyNdM7Y/ujuInyOv62eNW6dOTNkEnoX8ApflY7LGZ2I22fgs0S/jS3+fya3Tz8pICg8UP61sO+jIoJ/IMje2Fzhgd2Br2Ib7UbQhzAdMnuZI7SVVWdYV2FC4TM3Ran6a5dkxzZom63W2Jr08cKwJFVEB8Ji7/t+mzmAzNg== 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:05 +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:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Oct 2021 22:53:47 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [acTKdgJYYwtiBEgflQmq8DnZOclhmUun] 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-6-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:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 77b5f417-5c42-4866-4106-08d98842450b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiS+KSxcjYi+gKEA6YP+MkHedYnsbry6fsAm96t49v7/EUHXyTINc89UqQtn6el9tybfqbuFtTllrSpdgWr96FfTQlLnOMhRxV9MSrDpwnCQkueYzi1VdR1E0KhvEUvMDKsDxiu8KIjkbxRw9bJLIg4IXnlCeucDreNtuH/CFCITdLZ3E+4jf+UxC4B5oq5wuvQTUhPzRk+oJStB31ktvdx1yMtr6cCVW/t4cdd8vLFVI3bF76yrRJSx8PugCFHA5Ea5YVjqnnSQLup3cMgt9dHYhLnmsAPp7Bqe0Z7u5+oqA77nydqyN8NG98tTothoJB4z3Ctp1BFWSNOA0qqJJwSN5epLXrFDFe23DCPVb8bjNj0MqoDUGIU+ZLVMZ/QHOQzANH+M1pGfulMVrHG4l5rrRlS+GYLn0xO+/+b/XZrNAXoMvIS85a3dm079g6oA4ol9EfxDqpYm/SqIp+RhZfljMnLpe7jSoBwK4kQh3t3hlKKLNmkb/8RZwOFZ6cdPa/24Y0jonFBdfOrJGm41SnZZDaQphY2aEsOAMjYOp+nP4FNvTxS2520fZx+ZSVTPgJoWWOe2jglyVPQTPVdpqPO3Wpm4MlecVWkfBD4/1zQq5dN0tnJEd01L3OuAAuF5eHEBsO8TEkHwusNyg2AmDyNvHw65rxikX5qHAV4C80Iekxo+QOwz/5YRf8Bq5iqqF6JCavtd1J5sX3+66uOJLOXmnhZXalzaTftGCmoR/yRxGIBcJML8zRiJrJtjMcfDQ+E= X-MS-TrafficTypeDiagnostic: AM7PR03MB6184: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ywRVBa0tTyz/gFulVHGKTb1wIxi6QDm3RaV02FkkO1k1uPC3mz8Vx+AGyyCO/tZZvSQtu8zYkcRTG5ggp9GvddHrLNIknwsYomqFbx6NRtDbB6ZUqdzW1hue3YbIKnzN4v/OqDE/7SRdGTPqDBP0K1Kwz9rJPLcL6IT/Qr2XxbPH8YAasSMm0854uNBR1GzPcFKbCrpY0SYgc6bOSO4DYx/uLlPxd4GADNEUsBqiM6sSabwMtNBxZHT3X4iOiRJYzBvw6vg9G7vQWiNBdFps8MFIZ6k+jM7yAJFJVb18VTfd90Qmb58GHMU4ChgcUdfFGf2BE3yo1pKG5gGfH4zwo6yinWuEJti4Pa2PryVbAzmqv5h44dEUuSSTxLpCTMBxNONc7lqVS7b3QdFP9jCM+0W3HdG/iYngkaz+GgjE1/WHB0sa0mQtGlwIK5m9RfSF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: baVsX0d6BU3zETEed5zOQek5n1G+TgoUNh/oT8IsDDaH/4DVtpsbFc2PN6IwUeft7DTI+gEUxPgF063qVgzzzW+pDUA+y/tp28i4MjOx8LGsSNk8jquBNSh+a4RdTlCZs37DMCVxmBe7ayS9HiK1lA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 77b5f417-5c42-4866-4106-08d98842450b 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:05.9251 (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 7/8] avfilter/vf_thumbnail_cuda: Fix segfaults on uninit 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: ifq4rO3uUK6p Uninit crashed if an array containing frames could not be allocated or config_props() has never been called. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_thumbnail_cuda.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavfilter/vf_thumbnail_cuda.c b/libavfilter/vf_thumbnail_cuda.c index 491542c60a..7c86203227 100644 --- a/libavfilter/vf_thumbnail_cuda.c +++ b/libavfilter/vf_thumbnail_cuda.c @@ -306,6 +306,8 @@ static av_cold void uninit(AVFilterContext *ctx) { int i; ThumbnailCudaContext *s = ctx->priv; + + if (s->hwctx) { CudaFunctions *cu = s->hwctx->internal->cuda_dl; if (s->data) { @@ -317,10 +319,13 @@ static av_cold void uninit(AVFilterContext *ctx) 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); + } } static int request_frame(AVFilterLink *link) 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); } }