From patchwork Tue Oct 18 13:31:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38799 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2107871pzb; Tue, 18 Oct 2022 06:31:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7Es82IwrK6Bu6PprAtct/qiVEdxKvm+hU5IliQnSN0h4sf7G/5JHLBDl4PFDWwqnCcyXBT X-Received: by 2002:a05:6402:51c9:b0:45d:5efe:d1a3 with SMTP id r9-20020a05640251c900b0045d5efed1a3mr2645002edd.58.1666099903326; Tue, 18 Oct 2022 06:31:43 -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 l26-20020a17090615da00b00741a18d4a5asi9388311ejd.994.2022.10.18.06.31.42; Tue, 18 Oct 2022 06:31:43 -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=TLoe7zzW; 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 7D29D68BD83; Tue, 18 Oct 2022 16:31:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073077.outbound.protection.outlook.com [40.92.73.77]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D065868BD7A for ; Tue, 18 Oct 2022 16:31:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vvk0CFUEPNBWmuePbPBYyaB1I9NMA9LE0bSTpoL4sZZXjjHy/kGVBA1e8975+rKlm+/2GIE8TOncgXlkJ+GIR9S2FTBDPZpENhlIsKnAnyHJys8CMBldaPzC0QYMtBgAaeC0PGGBlghO6L6eIZsLBXRn+or5rV/IoBfnTnqjA+An3i8SQawcu+U7P4nUVHxhfLZaK4A99kwq30XfIo6UPd5mTVQ4c91s9/n+TUiJ7ppAHNZt6CgyKk41FYql7EFEN5F6z8eh04laqrG3Zf1P41Ru0PjRcdxVZC5e1kQs0mTOd2LRfUmKXssalhgkixAdZ9ds6fR9uEaIdUkTT7SCRw== 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=p/IO1GpBz9Zkd6644pJk7mrJO1SAZFXQR30m1oiO2dg=; b=WTD85/sldJS3txJNIWDFxIFNVjJdAYfzUlUIrEMbH7WAWx3GiTDxWHQo4Z1lrXN2JFKXKj/483Q8dDadEwKH5IR5384eMGOZKl8fDwpBT/Og52o2sssYkuQqeo8j5YksVJMWWKZnuFTReyaN2ZTSB9vi5S2BcxoDvVuIcKvq5QZj5DLzvApCkcUBAgMGohcrTf7IQFzD8aR8irWsH72kmwh5xRm9gSDm37kYSSYRsQ2l1apYCNuPnIQCAP+hCsgRuuew5RVvhHs1wfMqeUzrwK1JIhgKudgfInKRBRonzZNwW7u2Q6EZ9kLHXKEPn7MoElI73Bz9UHMDpPgXD+heLA== 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=p/IO1GpBz9Zkd6644pJk7mrJO1SAZFXQR30m1oiO2dg=; b=TLoe7zzWW262Z67kntZv7VtV/a/yAzouDz1v7gU9pSCTXPWSE5YQG6WU2bxDvEnG+CTb4ER7WJIOw5B2tNnKpNGro64JAbh4Fk++lJ4mYdt36Pg9M8UBq/SqFKxArhfkGRE8Pcs4fvXmdE6G/UAyvWjuGIQPubksNUQuACbMS35GLj6XxU3XAjf6LmBTXZcks1K7wb+Lcq3LhrU479u/EwbUwATfMPR9Et4FXWLEbTxbH2/XEenGLh7YJVED+GfGXEEaDURynCtTVAxdEPORoMowYYaBS+yuuLYyDjiEtaoK5GC96tcxOp3c2Or9YzE7N+cQt9pX5T3luX5IYw5ziA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS2P250MB0990.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:59a::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Tue, 18 Oct 2022 13:31:32 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Tue, 18 Oct 2022 13:31:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 15:31:21 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [IKhldNzU9VJqTY44W2SOJNKhubPTZa3GTPgvHJTOdas=] X-ClientProxiedBy: FR3P281CA0013.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221018133126.313251-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS2P250MB0990:EE_ X-MS-Office365-Filtering-Correlation-Id: 893a5e08-1a7a-44e1-7df2-08dab10d1230 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3kenBv2qQqPjO4Z0b+rcDBPsDOZWSmpbpIklXBmn8g3yG3UU5qBNDajhjSlKJsjQZg04uSBP61n6eHzQirchpvW8UehbuGZ0cOuJqBeHlodCuK1uyerwRachBXFAPkQLmzbXK2NmLWU2w4lLecnrszZXU2SnBp4M+zFydIEBVR5iXXTgb8iqxANoJ1K0MJl+PEal7zd1/PH9HOxqHhuzsiKGtZ74vEUi+MUKL3j4qX8DfTlEtFbxewZ6k5UK9ycKIKSFSnO6wr/VW1xfHyJVgYB9BnTa7MxVJZS28XW4mv1Qn4fTFXEXSEjQn9rPDg6Lse7abXXnVcjZZyNRujBz904VPxCbgYH+8UgeT90CcFCBk381MR0YYZVO/4OqQ3VOC+32kZ4gXzp1I8YPmOX5KyUwAVqw+zl0ItEsowBeh/lTTDcDfi5gIDtg1eIrRSVJ6oBWIE208B6OyTFhb9Hf8mA657FNxfkkj31MXpxDsDLSX0rtik71Ys/8qChKpvK0LFVHwWQpjhegLgRaGNHyVX3VPvB0DhOLVOMPeDjShLrqlbQLyOy+dmF34Fzd3Ipofbs1zZnwKhAsnsRKzs+j7lC+U6xZf7R485rsUMaL7hDdTJ2C00R+FHl69xIJ2kld1TbVd0AVmvc9+2lvLFkZcy94YysNGBKLE/WzIFVwjETplWZtLJsj9azX+1AJWtLFc+rxlwlvcSgwglLpljNWJHxv8aTPgaJZeFZ4OvOVPpmoy5Xf3/EWAjllDz0B7PcMv6KyvVhJJ4DZ8eKCId3pepF X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aCHkxAiNekn7V0EwWbwl+aYx8ynrPc/WneX2birRy1/OFY7IDmEiwNWwD0zTQl6Ca20mLfQXfgo3bGwLZGLdGW17HHFnu5CgqLnm6930iUSt7Orm8J3cMBgJhw2Qr/cDhKXMe0LXPW05z1PN0LY+WHHpYgItsmxBUvrv3GiP5CA3mYJJpxtQeYn3U3eSr26L7dpIiYon9QvjofXEC/tWehgWmb2IR7b4PhqhuXRnLAQKzpKN3Av+iis9yIgaLFLt6lBZOE+YJsW8ti3z8C+LzixxzAeZ2A9Xq+/ERKliSRoiZ0hKaEMEwDH4K8nl/BRaVvzKKoDvJCxl5aGinOK4eseGnXzYPWNYtiu7rSOoWvMdiqCbUp45UP2r1Z+nB0mzMg57qJ0Fnj0+9hq2G3fMZ701WlagYj1Tuhk9Cb9Nno5quCvqaKomahHpnE6Kt82CS4dixSg2m6iQMyJSlqjLvnPuCBdrymyFEg9GQpTySik5EoXMNKWlir+AB/a19UQVkhX7prDtTnXSGepApMwqIU+4Yu2hdJHVdWtMu3Yrpnp8ClSly0BoQ8uhUqoamtD1pPiNg1XOehBOcmYPpAe4E2cqEizD+9wuP4RA/da2UUrvfsX/xURRAgyrIBIA36l5eP2GkDnobmg4F84dtN9wyNQPQB6J+ZDJq7A0lyRnjvJctGYXZ7g30pTUywF8CEDb X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 37H6wlfsCcACeTB6oJ1egBd05T4EVCxGTzLl96S5bBoVaZgx9hLGeC1VKGHU1DFnilMOO+WjGbH7ECHvMNc7PbqLKBBs8th0QsGLnj6n7vqRFYle4cP3UYRXy1KqLydglhNrUDmb0xYZy1l2v7bi+UUDri6+2nUGEyFnV99b71XkYaCkrR1De/3WNK5V6t0CsH+6EnbiMKx8kA//Qnl4RjtW0lxyH8+48qIQ7cY7MuI94J7xlSxcKJiAlTAyI5iSzXIb7JQvbabLPKzv7Guj2akejL1JP/vn7S0IN/XKb9ytGHH3WsFTtIwjO9vFc1ogHFlfZWUh4kgDI+Bxd2dsh8XoDqSE143WuEOFKVRSbE09bOEOznhuuQPyCdQSg6GOXChmZmng66hTnF3pltouMEpl/LxNu0sSmc3mFDaQ/ReCsX14sh8nWQ+LVaPV0HMXkYmuzHG8QUAYuC4Ei5RvSKDuaee4M9jWR3VYs8pdfK4sYuO7KAO2FNKkfXWveHBKBLHvFuUCyQbWXDDMly841o9O3THm5Slln2drK7J+6humQADceMaoacDByzVTAKU70dwAj7IK2oTcH0E6yGujdaN6ywrls4eupBRz04STxXwPDfc3V3Dhc0XPsn2b/v0NJ7lTx0awQbK5xlDkireBnR81R9Svbr8QfvLkTona/o9UA1F+FoRHyzWJ/HRyHeC1gjZxYYNkFcdivbqAiLNK2kUFyJaqmIKTKFiezXkKKksR3JTCHDcQ902MN2cIZYe13TFXYTCjsFG3uxkHZRylzOqgD+99zhJfVpFBR0N309J+AU3US2XAe8jMNcFUW9dId1roMykwbp8DNY0jhJ7fN4L0Sa1Xlz1K0VVeqSImQVYOl/GyhPQ+Os8gZ0zX5XPZeuEsHAA6dLqe8mXNRccy5gl4PU/+QP+fL7FPLY63QilXiJUcdKy3MnUdpL3VbOyQMYw9fy5iLOFC4UA5BCEBWUpcdPcjGdDX2ydiYaJconlF0PG5A1Rts4vuJmkW/wbiRXQs9FQkRAdb9zkTRp5hAbjZJdmuhb8J019Brkx3NMtIuY+VqS8mmi3kWWvFJzh15rJwaHX8/umfZpWId7lyZWSDcXD5yska0S2k2+j935s34JV3/U1b/NBqsUB87BUDzZnfJwB4Cr7WC96FfMqrNkRZxMuf8nCbPw0C44yrtF1BCGTa49a8YypV/YH+NpYOjaQdQ1H2fJ+2yIZi8+WwghFDG2gKYO5K7DOtWg7cUm5SXxSd5EiXaXf42zC5k/7NI1UTJ8LjBIsmQmaEClgSzPpPEco8kNyMxMb2GcBlLQFRzaJhI7TaHy+N0DU3VZFa X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 893a5e08-1a7a-44e1-7df2-08dab10d1230 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 13:31:32.6393 (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: AS2P250MB0990 Subject: [FFmpeg-devel] [PATCH 3/8] avcodec/nvdec_mjpeg: Remove always-true #if CONFIG_MJPEG_NVDEC_HWACCEL 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: d6pp2csaM1YF This file is built iff said hwaccel is enabled. Signed-off-by: Andreas Rheinhardt --- libavcodec/nvdec_mjpeg.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/nvdec_mjpeg.c b/libavcodec/nvdec_mjpeg.c index 87f7a99a46..fce464c1f8 100644 --- a/libavcodec/nvdec_mjpeg.c +++ b/libavcodec/nvdec_mjpeg.c @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config_components.h" - #include "avcodec.h" #include "internal.h" #include "mjpegdec.h" @@ -71,7 +69,6 @@ static int nvdec_mjpeg_frame_params(AVCodecContext *avctx, return ff_nvdec_frame_params(avctx, hw_frames_ctx, 1, 0); } -#if CONFIG_MJPEG_NVDEC_HWACCEL AVHWAccel ff_mjpeg_nvdec_hwaccel = { .name = "mjpeg_nvdec", .type = AVMEDIA_TYPE_VIDEO, @@ -85,4 +82,3 @@ AVHWAccel ff_mjpeg_nvdec_hwaccel = { .uninit = ff_nvdec_decode_uninit, .priv_data_size = sizeof(NVDECContext), }; -#endif