From patchwork Mon May 30 17:03:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35992 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp2384947pzj; Mon, 30 May 2022 10:03:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyC5yOEkbiCaNf9rwFzNEcqKW86IP1zj2u2eJJr//5TI2aLa2v3Ul1sNAZDS1I4yn2NlrY2 X-Received: by 2002:a05:6402:2211:b0:42d:cb9e:cbf with SMTP id cq17-20020a056402221100b0042dcb9e0cbfmr9391400edb.76.1653930201103; Mon, 30 May 2022 10:03: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 r5-20020a1709062cc500b006fef1a9ef8esi11527282ejr.324.2022.05.30.10.03.20; Mon, 30 May 2022 10:03: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=ZJGnFXbN; 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 B41DF68B5EF; Mon, 30 May 2022 20:03:16 +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-oln040092064041.outbound.protection.outlook.com [40.92.64.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3873868B49F for ; Mon, 30 May 2022 20:03:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QqjmzWEopTqOpHCdYPuobqRHtNiwBGN2B4/PdhJCX/6VcmdFprCjCIjrGUriycHrbhEN5fn25bu3w6aDcoic2rbyWWd6STK86nfqwi3z1gFVmKfKTmKsXvZID26ySX7PG00fQQvjxRbnu9t1JSwRp+i7CDH3MXSRBpBLKblHPDaYeACGMsv1h4rBpjssSxNgdJTL0cI0mho4CMAXne58XNxbpP3DTqfgGakR/arf5kRSXgY50NMeIwpJJXjsdaaCmEGzEtNS2Iksi0x9hrNYHVdtMBR/IYngeHaN+0VuDZJBFUAJ/aK5AUa74Akuy2sC7iXx/B5Nn5raEBSiIEHSNw== 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=zLRJaVJDf5mIknVIl4Rf3GqpiNXrHdhp7ydxaufAFco=; b=WNNP20G8GFiNKNP/hzeIfLdu7gZNMgHzWMWY5CBndwJMvEA4u4dHtaD5JRSZbGbkzR+bCMxH2tquAOVBXO55iK2LBZ4z8fLBt+sQrPEtSevn13D+Zuiw95mAqUVgXjNT39GDlBy59yJhbTVj+pmaSboEJb7WdDiT3pmyJknW98NGyLgUKwqo9rHy04OrkQRJGr/XEK/4LkG3xsxe2wxoDWsMifm6WdTbyzNtvqT0F9DUXceyvMbNFzHdDyCS5uOJJy4aukY30AbGr/CxRhAvCsxjE046PKE6lia4409b4b8tyE2ZLygzF6YMOs5NK1XiRQC6olCTmAab0kP5IA8PZA== 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=zLRJaVJDf5mIknVIl4Rf3GqpiNXrHdhp7ydxaufAFco=; b=ZJGnFXbNfbKIUUbwYE3S1BuC5tIZ6AnucX7MdvLQ6EO2cpWqsVIGiF+Qtj7YYU7t4SPmjrbIHaepiMXFYgbUHFxWnJ5BkjqKTfi4njSIo0Lqx87xkkbHzLTbEtYfA5VBvg7dKbsbUVD0fO1T5wQVSndQGdZoArmJcAA21G6yzmmsbcblj2+HRr9B3qVZwkMK4D3mI5yZ+YzQJ+V6S+sf7g2fSqJOR01crP/P0kKqwz2N5uzkI4sQ7R48p/MQ3KQp7EjJv5P8RjMdA8DKtqs3Hdr9LhVNEYo3BwSdECyJMNpOB+n9QBZ0bt5DUgeMothMEmbY1ABHXQeWyc1UyfPlOg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB9PR01MB9342.eurprd01.prod.exchangelabs.com (2603:10a6:10:364::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.19; Mon, 30 May 2022 17:03:08 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5293.019; Mon, 30 May 2022 17:03:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 May 2022 19:03:00 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [ORyPCZT3ZfnofeW5s8r5/igzeXNSjulm] X-ClientProxiedBy: ZR0P278CA0098.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::13) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220530170300.730387-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0956951c-e6d9-44ad-b02e-08da425e44d9 X-MS-Exchange-SLBlob-MailProps: pxu8rxgqUghZUn9jyfEac3rqaxYSXT4zh+4yKd9ShGfUPjLjut38RGg1OiZw+A77Vii073hLHkb/9MpnlYcvS7Lb7vijhPUuPzO89DK3vqq32YzR580K48H7ZZx9o1xw2PdJKh7KngSkmjH2zT2SKOWo4qbRMdSwfclPN2xlCsPUNRQXWDBmPHullLwmpYUdHnx8bV9CVGYV0W6VJxFvWAqiAdGN7O7RAR1JkevU8XfsUyrHULK35E1f7uyQiHfB7nso6llbt3qVJ2Laxy3R+rnmqBm9Ys0kOpPsLByk/9gPMnxg3wWQFcZXsFiR/e+Yw1XQ6fZGwJzanDX0cl2MMj+4p5Riul+x7iDALXH0sqY0BuU8mv0P+rMdlMjRDmkYBkHZ2SPNAM1tuVhSaVVplSNPs27/o3IMAmypmYbbwPPXi0A25w6dHFz6DQha30imsjpF2ovQCNqRoe8bfFyHnER9oPEXcGXtgjq25qvpHgr4PjFdjmvzrylfxEh1G/Hck3f+KJ46LFNabBaCsF/ApIOt2ncw0vAWqSKzSR8WcjSSnq3KjvHGYkmGAOTw3MO+EP3kamZQjlFelifZncXzPZ7wJE4fSq22oo33OmLkGxYE/FwquTNv5cPgvrkGwqpAd89YB+KQnsKqb7ueOZf2/SmODfgLC+qfUb0PcZKqTM6nshfXDLLd5iIhdnFhKo5jbz0RIUrAYMQbd6BeqTSt2w== X-MS-TrafficTypeDiagnostic: DB9PR01MB9342:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Xk0iATlV9QJMa4iMOe8paRZ9+I0oa2xTUNS5eml/zSe1U6sufjLux+WcLfBNMXJL4mUZ1Qh/LWUiACNkTtbefi1Y2RdBH1Vtnjg6Zz/4jrT9Or+mD0yqtDV3DMrEptH8X2XqxuQIR3v20oEuQ+4R5blfG8C1SPKZvO7R9nzcCw/CXDbJcWnwS6D+9fYRIxllWKkcmjD+QWqF7wffafdYQvxH8k9Ajg19cQduUQDHmD2EG4flS/chlD4QnmfHOHwIDqR2b1hMD+oiIoXvDg5bxb870ETQdq0d+s6wbzVTr6ywXBT1vxAp7EHOdQMPpmjP7Rb8A5q86F1TDFOMO8W4eUgWXSQVbZCqVBePcdsvlyLi5RM4KjYiQwtwOiNQWh4AIrBRcyt/d+ez88oDwJwj8caYyMhSGfZV78Ujf+tlq+kwtXEAiyfSeq2gCemXHJgYajkX4EXNd4u+xC7Oloc8yPE8DdQCQJsqUaiDfyRAyBpt+plAjAaWBq6V60uXwV6Yy3x11JZvGfMt9lBTILqoYErbt9bHuW35CZT4Di3yZje0hA2Sl0c51w7kGHki0c3XvP/e4BRcW3A5Ugdpv1cPRg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7BQDbC+CQ6zGuT1ypq07NsvwnKQLOLmlWewoGQAJvbFYZCF/EjRcpcpvmEsVbdJ9eMxPqkbgQBpAafQIQez5ZTBsxhTbUh+ym3mX057doWkqwdwUVk3sHFXbuXxalRFudb4IACdrazPOMVn7vIsqoGmBxOqd4SuGfNuPydOAIw8+lpc6pmKwlFKXgoydO49s+02KBOFGCblU8h8udUXM74wF2bHJjoGGhM+6R8/RYNkndx0jeu5t0zmeBxV6ph3FyziGAJHoXDgNReoXIyjoRYOD3qn7eSctHaUbBK7RwZsytlmej4ffWuD019uYfA8nfOH13pDCANyHMv8YuYtOrkEs1GAxTZlMVsIHZ6Th2QNGyH18xNfMtgodiy7xuwTWxcsBUCtrueXoGTVmE2BebWi4bUpD6snTghgxUuHJQc5Sly/1QoWUKioQXMLmAj2Cgo+Jk6E8MJimloExIh4U/Rb3TuT4bMuUCD5hX6on6VRxW8GIk1Fy208JrUHvdB4rze+LOmzEqlXPeQ6MgtjeLa1z38IrDGJPYcBt3xUQ8xVPpHReZSDROTlWG2VJENj9SbGnpzlSy/qIZDHELUBY0ZnOCC9WGi4pxm7JpYYLKpBziMeVcZjr5EsYT4rMuv7xeA4j9YWAuQOkroFADjjznmxBUWqcv/fjvzNPACOcZVJItLjPiJDLUKXk65t0waFtHoX7aXrcD/88me4VT74/1XMbyWvmRfflWun3/CoGgT0b6/cPbClc+7pkTRxDuUnQY0dK37MVmSWQnZ1uk13xJkVMyV0dVfXGnVtM5Z7Md9H8YWcEVEUizChjTmS691KJQ3Dn5Q8sgWP4kXv8IQeblEXDhIt1iTjvCe9GAaCW6YdCKEw8XtZ3oDuxhIZaFRw0cAxd+nT+SQNI5qjpk0mJlt9kTpdkYunGPAaq/dgwVaVyCcJVLWfH/xqu6oqVfm0kZ64R2DwxFzEGccjFWB5ysj3lMjvz1mxy0PI+4i47B9DVmmS9Ri+hVMEgn6MrZyfIJBJS+0DmBDET1HNoPQFysYLq5cMWMPWFnQ/lMXmagrqCC7DJ6ZjfHcxUqmq4Q4kaCoGGePwwiQ/YT8wazd3eIY98cBnyFwtWFSvY7eZhhZ48+OUVpGkrhdxQp7uyEcXRmpjf9/YZDi+J+PvN0CV5BINtlUofgln90hTVyFubiWp8vPZP3UfEsxQIOni9LZW+cIUWQSiy/vdzr5K4FS/01gBM5XZKQLcDmMBCgDnYdmfiAnvDZV+GqvCtkPYv0dDZnU9GpaU0PH+Oo2JpKcPU1FnsuMZcU7bdbgqvuZj1yQxAHTsu6143/FSD7cDoK8XkLVQ2NSeso33s0CTGCHFfrWwsxBavO+9jHD2b6jmkIzX0u9PlBgjGliefbvVWb0DqaeIr+FNTO9TF+v8pdTV28oeMZyQiRFdnDF0GAn1BHRshnNwmNph4+2iWqoGhfeSttVIN9nzaJ6J3XQnAxRspCA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0956951c-e6d9-44ad-b02e-08da425e44d9 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2022 17:03:07.9572 (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: DB9PR01MB9342 Subject: [FFmpeg-devel] [PATCH] avcodec/iff: Remove redundant #if 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: EU77HMhqELQ5 Since ec0275843d8eb933699807da81f6f366291f034a this file is compiled iff IFF ILBM decoder is enabled. Signed-off-by: Andreas Rheinhardt --- libavcodec/iff.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/iff.c b/libavcodec/iff.c index 36c9535d54..74ebddc621 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -26,8 +26,6 @@ * IFF ACBM/ANIM/DEEP/ILBM/PBM/RGB8/RGBN bitmap decoder */ -#include "config_components.h" - #include #include "libavutil/imgutils.h" @@ -1908,7 +1906,6 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, return buf_size; } -#if CONFIG_IFF_ILBM_DECODER const FFCodec ff_iff_ilbm_decoder = { .p.name = "iff", .p.long_name = NULL_IF_CONFIG_SMALL("IFF ACBM/ANIM/DEEP/ILBM/PBM/RGB8/RGBN"), @@ -1921,4 +1918,3 @@ const FFCodec ff_iff_ilbm_decoder = { .p.capabilities = AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; -#endif