From patchwork Tue Oct 18 13:29:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38797 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2107036pzb; Tue, 18 Oct 2022 06:30:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4BYc5GiZSMMK/oaZHSNujaZKIcM/m5CJCu7XENv5yLsdo9eDwCmYyszoP2xpVj6OVYAvwF X-Received: by 2002:a17:907:3da2:b0:78d:3b45:11d9 with SMTP id he34-20020a1709073da200b0078d3b4511d9mr2440258ejc.87.1666099810865; Tue, 18 Oct 2022 06:30:10 -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 ko1-20020a170907986100b00782a5657512si11014726ejc.416.2022.10.18.06.30.09; Tue, 18 Oct 2022 06:30:10 -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=a7vTqMUB; 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 55E0968BD2B; Tue, 18 Oct 2022 16:30:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067032.outbound.protection.outlook.com [40.92.67.32]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D3A0A68BB19 for ; Tue, 18 Oct 2022 16:29:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c/QkZNexKo+CpheELZ78+KSUqvsdrJFRo0rDtWTrs0UDjU+bwYLvGZ5SfxiH0VSRAao4Gv4j9RvZaChNjvcQHQQXTg+lmw+rP2Ipu12/Kj092QtJZK/MsDVC3ECjdiuLkDNg3Jfye+vQfx57IK6mQL2TcJJS0Rc6tIbHzUYrBvtPwlgfX8PxiwjPV71cq4HBuvUwMULum0NHUuOfGFjjZnbiylxXD9XlABS4/orzYd+se/6+Twa7i3BVx9O0PjQwAMvfTF5wfQZHa/JTyDhkpN2mN7zhGCg1HKRH+KhK61/RlKOrKZtblzp0HG9P3cv7/MZL2gNx2aLICRrcoU1GAA== 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=uDc4rDpRlfYRiI7o9okAi6EJhLCQi6WvbF+fbQEp4Uo=; b=J1kXyuvzmaMpTmklw/PtsRLc16u9AY4tW6fT6H/xZnPH6gXfjQNPcSmP6YdTvhWlsl/EvU7q8NKw67o1g6ua1JTdHQz2W8Z+baT1xr+2J/zUq8BPa6ANQODcFQjS7P/JAaqJ0O6gxzjOjw60Gty+P9mn71lFwvjdYn7aCEJ5wj34XC5EzF+Bj7hM52gveMwpsF08OYccx7hygHRhSQE7vh4FgY2K87N5p+CKUgXcnzOShcBCfZLW2wdRVZJS2MUljQuP1jLJFdT4pO6lythOIasrQkufJXRpYIFjFbb9AhJilL2WzAZITUDZY7XiJRbnyMmdSm6h9yKbprsoH4GiBw== 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=uDc4rDpRlfYRiI7o9okAi6EJhLCQi6WvbF+fbQEp4Uo=; b=a7vTqMUBpnBRZSYdqTZnB9sUBLiiQBFVmLGtHxDVtXicrvyxbyWk4FdNYly/lb97XBQLf193C0ohswJJigS2/JWHX6mKmQLOztkU5Qi0HYMENXFlcNm3YTY+BKe9ptnYvpZ2g6ogXLM2LjoKMT4WDON3E0BG0+T+HbgKxzm3QbS8T9o19Ei0oav9JgWiQ0RQR+EWaSKJL56VzYaJVt20VpyOq9HhwlXhpS+/eD7UMFynlxgL5V4FL4yQSAtZYw6NlWoZzMfJfywpkF4TcGTqr64vITkAH6ReIwt8dlfEQTtvc2i0ZxXP+fuqtzNH2fVcMznluBg5GwFtPtmRWMcyVw== 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:29:57 +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:29:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 15:29:54 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [XfDXTTdoyVJIw8eL5/RTIpvkaT3pnG3+AruCGhC6RpA=] X-ClientProxiedBy: AS9PR06CA0326.eurprd06.prod.outlook.com (2603:10a6:20b:45b::34) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221018133001.313200-1-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: d7fa0c68-57d0-460c-e8ac-08dab10cd960 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3kenBv2qQqPjO4Z0b+rcDBPHyNoGNVTB7/X++oIE7PGCldcZZoTSF7ZpK3ViAmoLuwwAVRnjzP8Sw2xVTTBXFY5Wl4kkF0gzChzL1jUlMW+vX8fkFqEdt9T1aSP+VQFjlimdfX62GcBuYfeLw4YUnCAqPOcpW6nVZe69DGiq04Bh9NQoYM4ZSt4awHRaplNDJ57Y0xOKluzteqfWQwrjkfv6WLSsPcaR6gd3psrHCFgUIrH0//oyQB2c7l80IyNCqfg1iKqzMsf1+gmUpYVRLHRegs770ha9C9WqZp9tHQ1XmV45KSqNQDrGISL6p37mA5t/fgBb26ZK1077+e71Sj4HPttZZg6Lm+xTqGqhlX4LijxDAY/mPOtx0LPwePyRuX7g48DfhErrwngKM7Mgtn8FCR9nhg4aahwdOjR/7v77butfwpmqRZ+yKXEfg0a//HbMme6lAxAC7RwyHI+0siL8mYur9RoNqknOtckiIPXp+REuRi/UYnxnJIFaPsPWpFtu0OqOco0nlqqkekwn8m8sEGEc0Es330C8ZX0mv0iw2vUzJECwA+EHQ92hMg2Dm623yuZ34sNOqonNVKESSh5OBem16uyFmxJLamSU50ZCcGW/a5cCYOOagyar+iog/rqX/tSdhXNhjygCiBZiDyGy0WWtY01bxwBhAMgCnEeFKo7nCyrr9hXi9IWN23qNX8lhzz5oBwm1OrS4rPA5Da6Sxb7kk5XRqptq6SOnjpvDDQJmnARQO0o8lcEjEDrO/5EDV1P2rLtX4kEW+XqqgJh X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tEcuuw6FHA7AreNHIkkT65PshRZwXkZtLYh3YwRHNIxV+vZOsH5jpto3ObD1hn6miZ9H1YODjoBxP1ajTrNWvlIP0pZulvd1tlpSGbt2MrL+Gv0lrX/sdoyUiYfRilKoFIHecw0rNIIZP0EuDeXszK9FpIDkKfUXqVhlJVodLEpGmYH9OpLP6hIIRbfkBYq5dckMGDRS+mBU7z7dyFs2aUuksRY9xdihYy4bcl+ziIrSzmWbMhe2BBvXT9TpUFatQJrN1ETBgJXEnoUwMWnCkRfkZ9RrUbLeV+ZTbMBIFIWvj8H5DXPEHlUePKBI1d+DXAfpGZP2w2SdLyNW7bRtLYVnI+dxfP8YFqw72b4k+ZjJsXHlrTc6mqlJkE1Bs14oy3S01zRA+tLfnny1uDHj1G3spC8+Tx0OYoKcbcs0RGtzi6zHlWlzx+KUNgOlLQGeEbUal+dRf/FywwulpFmiS6Gv9/kiepC+6h3jf0fKzsFOr6VCECm5q0gBj8PDs2u4CoAOv5dwQCE/RyzVEPkX75w120m+tfEQl9ZqMhVFceAEFreVZ/dbpMgjb4UkTsYw0L8AVtlTAWANHAXgjaKn0ru7zjF6xCyvfHBOVEsEfX9r+EehuBD1yq4BMlaazvne3QQnrqLBrUFtScSWniNvB2sA+XNedgdccwhXUQ465Y8f2wqH1l9aEo631ky4c7SO X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: li+dLS42IyoBNgyYmYfS4OZeUVfJg3sNl445nYnV0ccfaEoHMjgc9Qoyy6Sfh5Ag1aOkM6zIpp+pE7cYeNxz2ODnDWs0EXCuA/EsnP++bgkpgjJQ+gMukVaD633+kxKcAJad9GYQbiki5Z2anrksb2Kk2mKe7Y9Ve1QU8xeTU+01EsS7Ovgz/O3o/WE6fD+LLD3u78IhRPNPGfvdYBlTCuc8bboabZ5r4VQj+7c5fx8bezB78jnNc3gSZYMG4UUM58BTryHDZtGPA/d+WquW4QZ/Ts0Y0J+xG6u3ORjgr1raJ41sV9B1isQ78Trhla64f58T9KX1H2d7n1tFtkgrGk8x15sAmhJvFNHeIXnqTIvyvRGhBuTis9miRtkssTOlCLTLLUsNWnj1in0QdoQg3B2rn/Zqrp7NyYhKJSKFpSetFAeGqilCIVMcZLib0vQ5p5GHE+KZ7mmWYhz1EuC75rMUON2WynzyA/0/PyWNRXQy1FhL8T/mlyCczZN2ihn27eEVorwOEN8rhwuoQOrcgMxtFBL+VePAXOhO1FRxyd4U6l0A1WzxJ/ZpRDlc4DV+SdyRqe+QyOrFEgW58PlYChTQjxz+7HsszR2jWOm9jMF5KyuuehBdW/0QnoZO91nj/ahQ2IuIj7E/OxfPKP1sETKtPQeVZune2h7BHtgSK+4t0qMA/Z1ZS1SqRW7Eidgei4vacG7B+Bk5PKU1dXHQx0Dza6g4KFHGNlTPe3+wKQqQZrwhqloFhF17sYSFHivfMLLpicJw5RVsu+UiVlGD33dRKm2zoG02f1ywRewF5d0EipOMJk7YzfY0fyfE3iSdh/2A/HmH9pxbGdcXem5cpux6iq5eVvIsXWOpRrvMvJz9tRA+5+xOGJBKsaBYXpX0pVGVo8MT6HNWjHFlOWPxwq71POgKUGYnKkzyi2gUW8CfH+uDDprtC8kCgY/AHdyz1cogURk3OCDBLFmolz2pkkCuVqpmwxqr8tFTwbgppOXdmdZs6pYeDhLzSebhH3hd6JvDDj8dfJ2+yxeKFzhybZ/fNN1HaLfEC0y34UMLdXztu7gLDk5qVI3fE6q2c8Y001jDiM+j77+v5eCChIzfpihhtoFqbOePsI2326NCniCgHHTEuPEAN5JfvAC9UXCklp3toXCn9yEP223cxLx2pFYq2PAtXLinNpyHyEvzMEe6yk9roKH2RFgUnRjpGrb50xxevTOawhz9Z4lhexm8NmAiOsnCA4yUfjxcsUWkVduqiN883MKBSuLq1gqeSvO2wf57Th81wX56QHSeDg+q4P/KftmfDDq2RFV6ZbXx7Eiz2EOBPj5M+TRS5BH5LxrW X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d7fa0c68-57d0-460c-e8ac-08dab10cd960 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:29:57.3420 (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 1/8] avformat/mj2kdec: Remove always-true #if CONFIG_MJPEG_2000_DEMUXER 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: 5ohwgyVNdMTQ This file is built iff the MJPEG 2000 demuxer is enabled. Signed-off-by: Andreas Rheinhardt --- libavformat/mj2kdec.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavformat/mj2kdec.c b/libavformat/mj2kdec.c index 2373f31b94..63c3e8a391 100644 --- a/libavformat/mj2kdec.c +++ b/libavformat/mj2kdec.c @@ -19,13 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config_components.h" - #include "libavutil/intreadwrite.h" #include "avformat.h" #include "rawdec.h" -#if CONFIG_MJPEG_2000_DEMUXER static int mjpeg2000_probe(const AVProbeData *p) { const uint8_t *b = p->buf; @@ -53,4 +50,3 @@ static int mjpeg2000_probe(const AVProbeData *p) return 0; } FF_DEF_RAWVIDEO_DEMUXER2(mjpeg_2000, "raw MJPEG 2000 video", mjpeg2000_probe, "j2k", AV_CODEC_ID_JPEG2000, AVFMT_GENERIC_INDEX|AVFMT_NOTIMESTAMPS) -#endif