From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6F9DD4A6BE for ; Sun, 5 May 2024 08:28:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A3FC368D5AD; Sun, 5 May 2024 11:28:31 +0300 (EEST) Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02olkn2085.outbound.protection.outlook.com [40.92.48.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6177568D570 for ; Sun, 5 May 2024 11:28:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JBm2t0X3gIWCtlgEJ1XOinFmb7N3oa5G7ofitSctnsNvpPOisdMh1rMzdn4VytvfMGvDn1/HLq2CzkjFE7X66+6yz7Nvep+qr9oEcooJO1CGtn7gzajITt3TI5P5JZDLImOXxmgHcsNDOUmzPnIaQ6aEfn9gWsCu8099pml8EgZN1q7MSj+z0TWctP5lhg3oh9ln5zoKcwrhK1Xw7xzliClA4RF9yO8VU+5q1xYiG67wcEF1D3Qe4HsC2LjZs63t7oqW4Uwg5yKc+oF9cOvJrby8Nf9Johs/sd4+8WctIghHv5ncaTRZwsz+rHFYxDrkMl23assbEgIeBH72KD5nIw== 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=KQJeVMzQA2nFivymGUnqltpcSxzn1G7sx/M1raxPT7A=; b=iwoeIBUhKllSHYG3dt9BNhZdQVpLIOKwfs7fevZwajWNctm4PWi09dmpsuQ4crE/X+Md38C+V615AynzfNYRpbOA+GYUvmdE/ruJyDtVGwqrE81Llq3o6AWEQKs0ORGYRxTeKbZwKy0Fx9qzdlZwYSbgXRZ+CAl6iYDLfj92r7fR3kYcC3NesqbJCDDffMMQS18jmAKWI6yPrubHFYHnFWmO3kVUtG8+Em5IUTfHnenZSAAFZAwkPFS2eAg+pItUsbJSCCwHAEN1hMyo57felW3MJC16naJMzPqWb7lP3d1nobDujbk7S3aHY11wrTj6X0q5jpLN5qGim7AActMc6Q== 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=KQJeVMzQA2nFivymGUnqltpcSxzn1G7sx/M1raxPT7A=; b=BsZmBwoUsoQ+uhfARB3/wE6OhqgJTB4K1qPOdQhk4ei7fNpAl97PfTAk4Zk9RB1LjvbhrPBBGilii2JjJixR0aVB5gJ9E3IP4T83acXErY6Xz+PoIcXK6JKrLKNzYaeVcCcYMAbbg0WwvfaWvMKOlehXWHNV/Qt7gijeg637qJqGyh+lol0Iqkajb+zBU3w1iZMX2eldchZ8ccmFu+yjfU1AKxO1QhVDNUSKDSYS2AfbQPMMYMdPPTFGgfTUotfMcIA5a2/V7RvBS8+xMIqLMVirEedp86fA62lTy8hWYxuj20h0B6K7eK3+Wwipbs/EjzcjuHuuP/DJcfQOTQN40w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by VI2P250MB1054.EURP250.PROD.OUTLOOK.COM (2603:10a6:800:226::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.39; Sun, 5 May 2024 08:28:21 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb%3]) with mapi id 15.20.7544.029; Sun, 5 May 2024 08:28:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 May 2024 10:27:48 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [8dzVpBpxZ7pDF3sZM7Np2b44Txc6R+CcZZ2WeDKXWdM=] X-ClientProxiedBy: ZR2P278CA0023.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240505082751.2272438-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|VI2P250MB1054:EE_ X-MS-Office365-Filtering-Correlation-Id: 78e85d86-5ded-48bb-0c04-08dc6cdd52d1 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: hMF7JhVerttd9iGC5CcU3HfQf73YwJu+46PmsZNxQHp6Ds4rMMuTq2U5O45HpUsnVLqwPxU6jJ4Ppl4T8sAw5AQuRBnnq13FS1Q9l7aF/mfLkNQNFb1Qa8c9UDry/GcwD+QpNIWAcc70bm7l3cA2pl3KklL8TQnIrH43ar2R1OklsZZFGQuhdl/WLkVuUzO6oQif5RJOqqHj0CWwElJ0zuewAVw1eaT7qP28YW008wNC4zt9Bmzv1rK2KD9LD6yuyh2PvrzUCTJZ/bGDKHGHuwV/ZRvrDV58PCQv8iaf7ObcH+7P5FfYcU0V2eeX8FQdhynlbtyV4jZxW+umVNKM3PV9VTLfJwQyloKjZCSqF8xRz+1+fihFZ8xs1ZU7czu+hetWCOZIg6ASXscTdmsuwW0a5mi68AD6rP4JN2WMkTuCOfEc62TU2bFG+zbfgZZ86gRdGMt43MqDprgsbBu5+OuLBB1EmU4qIu8yzYWlXfousB0PTVHj5S8TshxkvP14TE9fJ7+1bAyeVj8gyFOxCXMVOaAoOgbFfRIALolGKBU0Rffu8O2oH+HIBNYihLCOAOIHvsPdviEgEQqpUsqzUYIgx+It8HmJ4aILHG0tA3raduHlM6oUeYzeDLi3pOtX X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VGc1h5k2c3XEWcSxCQg86FNYTWDJjFGg1Dbuwa4surZh5bdxutRBL+81Bpnr?= =?us-ascii?Q?BO4NvEQ9ztQn4teYrsPnbG1OA4CWmSwtvgee5+wXWLemzK2Vxe+odFUoeGqy?= =?us-ascii?Q?hBnBx2wiT45Nke8FTH8hB4DkRU8sLQ+zV5degvCgvLCB1Z7JVywfIXokSY39?= =?us-ascii?Q?9GXR7eLHhewzA8eADFIfKN3oAsRl5oxQJd7fCGR+NdCwf0Y/NYLf20364Pe7?= =?us-ascii?Q?tixqSGSnImQ1LNF5ElomZ5DRO2AfyIZ/9BQNGmh7kNnFl5mYd7ga4EwnAeBq?= =?us-ascii?Q?xl+vmCUy/LGfPuIOMJSOmk0vNNOmEj5J39fjaYz88r1mJjnMXo06mxLD29ay?= =?us-ascii?Q?Ve+DyedskWQAYqxECTJLNPwubJBXtso3VUbqZUsCGqIoZsxKdOvy9V2zM/hw?= =?us-ascii?Q?fm/BwYMUJWvTyuQDqsoiOcBbO3lmRtZXKtMbf5x0JJ0ZuB63KVGPuwwMxIuk?= =?us-ascii?Q?8imjXPP49y3667OY6UkgHK2+sCs0hudnK6BXV4CCfn0j1INIcgw73ItfaL3P?= =?us-ascii?Q?zOsXWRYR+wvpEHoZdHoK1p/3F9Ez/Irx20m9iYAWG//Cbg8TlefkBTk3BaRW?= =?us-ascii?Q?p0pRMpUb0LCW+gnDSY7c26iZRdSdnesM5vdo7XG0SeczrbX57LokmR+MPpdQ?= =?us-ascii?Q?DqY+TnzsrQabie+cFtGMDu4MaNgo6F7sAH/+A255RTHB+RN4ffXRxwOXfd2l?= =?us-ascii?Q?t2BP0+otnKEgSIDdLQjWmWcMJl7huEMhrjCjvsQqFzAbYB1qWJq0CQlWfbJR?= =?us-ascii?Q?jiAH/eTBjN4MdqmptGr86xjXRYYfESQRZOu8Fxfc7wWGcPVzJdSPRy1MA18A?= =?us-ascii?Q?EEX7vI0Z998b9BLUkeaIQH3L60ekyKQ+XZyLJxq7o6S0mo5PqhZE03UPXctX?= =?us-ascii?Q?BtQi5MH/NTj80gkj+/5qU59eVVlTWr6K3wAZOo3pas9CzOI6JEAJt/0wOzGm?= =?us-ascii?Q?W93o9pys3r3HEZo7OfPvEi2AjVB4FBcm9nFc85Ck79H8j/eduwpYU0J6KGi2?= =?us-ascii?Q?xdFbmbiC1sgnUqvGTDXeu7uaAVNGq1/aqQUcCrZxfNZh1S18eefcnzdyfiWP?= =?us-ascii?Q?GoRckqbLCpRbWs5WcQAAR7jmRRQaM7hjizdk9f3Uk4VX8cD98b6F1T/vodfe?= =?us-ascii?Q?p8OO8Whtf2IhyDpqkgyckngP+K0ijp+0YSoKNgdNss9GSbvTLI76na+g4Ox3?= =?us-ascii?Q?3I6BHkspbT/XnVUCtOriRjlpBoqAvFX7dmZPT/A6D1v/IX8zj+HIEsYFCBDh?= =?us-ascii?Q?Ej6C6z7iPqa/4d1Mg4dMDcXkAgH/fN7wWA92xyZ2WA=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 78e85d86-5ded-48bb-0c04-08dc6cdd52d1 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2024 08:28:21.4330 (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: VI2P250MB1054 Subject: [FFmpeg-devel] [PATCH 6/9] Remove remnants of prores_lgpl decoder 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Forgotten in 5c6a3604f0592786db557c82de93112745597a2d. Signed-off-by: Andreas Rheinhardt --- libavcodec/tests/x86/dct.c | 4 ++-- libavcodec/x86/Makefile | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/tests/x86/dct.c b/libavcodec/tests/x86/dct.c index ef0662ae37..7800abc7f7 100644 --- a/libavcodec/tests/x86/dct.c +++ b/libavcodec/tests/x86/dct.c @@ -26,7 +26,7 @@ #include "libavcodec/x86/xvididct.h" #include "libavcodec/x86/simple_idct.h" -#if (CONFIG_PRORES_DECODER || CONFIG_PRORES_LGPL_DECODER) && ARCH_X86_64 && HAVE_X86ASM +#if CONFIG_PRORES_DECODER && ARCH_X86_64 && HAVE_X86ASM void ff_prores_idct_put_10_sse2(uint16_t *dst, int linesize, int16_t *block, int16_t *qmat); @@ -70,7 +70,7 @@ static const struct algo idct_tab_arch[] = { { "XVID-SSE2", ff_xvid_idct_sse2, FF_IDCT_PERM_SSE2, AV_CPU_FLAG_SSE2, 1 }, #endif #endif /* CONFIG_MPEG4_DECODER && HAVE_X86ASM */ -#if (CONFIG_PRORES_DECODER || CONFIG_PRORES_LGPL_DECODER) && ARCH_X86_64 && HAVE_X86ASM +#if CONFIG_PRORES_DECODER && ARCH_X86_64 && HAVE_X86ASM { "PR-SSE2", ff_prores_idct_put_10_sse2_wrap, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_SSE2, 1 }, # if HAVE_AVX_EXTERNAL { "PR-AVX", ff_prores_idct_put_10_avx_wrap, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_AVX, 1 }, diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 21c5e9b0d4..331183f450 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -61,7 +61,6 @@ OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp_init.o OBJS-$(CONFIG_MPEG4_DECODER) += x86/mpeg4videodsp.o x86/xvididct_init.o OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp_init.o OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp_init.o -OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp_init.o OBJS-$(CONFIG_RV40_DECODER) += x86/rv40dsp_init.o OBJS-$(CONFIG_SBC_ENCODER) += x86/sbcdsp_init.o OBJS-$(CONFIG_SVQ1_ENCODER) += x86/svq1enc_init.o @@ -176,7 +175,6 @@ X86ASM-OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o X86ASM-OBJS-$(CONFIG_MPEG4_DECODER) += x86/xvididct.o X86ASM-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp.o X86ASM-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp.o -X86ASM-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp.o X86ASM-OBJS-$(CONFIG_RV40_DECODER) += x86/rv40dsp.o X86ASM-OBJS-$(CONFIG_SBC_ENCODER) += x86/sbcdsp.o X86ASM-OBJS-$(CONFIG_SVQ1_ENCODER) += x86/svq1enc.o -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".