From patchwork Wed Jan 5 13:59: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: 33085 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp748461iog; Wed, 5 Jan 2022 05:59:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJzEetGYmI4ADsIExHn363E6XbwMhOshE39P8c7nNvZ/EPYeb6FJf3iAXfSUTov/DUmLBSfO X-Received: by 2002:a17:907:c11:: with SMTP id ga17mr1056711ejc.559.1641391181240; Wed, 05 Jan 2022 05:59:41 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z12si21227067edd.544.2022.01.05.05.59.40; Wed, 05 Jan 2022 05:59:41 -0800 (PST) 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=raQW6GxL; 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 EB2C968AC4D; Wed, 5 Jan 2022 15:59:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2066.outbound.protection.outlook.com [40.92.89.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8167E68A1A7 for ; Wed, 5 Jan 2022 15:59:30 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QFw3kF3ptAZqAu5IvCSAKUttrLy/mNhVrPS//yEK8cXIyxcM1xLKDh31I4WfuoTFKc2Orn8v5YRo0ab2Mv71YgWDgpyc5WQT2YvgvL8BssfE3S1rbLTa0KEgGbKGPt56fV7TiMdgg8LrSEpRKz1xSePDhWAFZuy2Wvvn9Qq7VwrL/tBugjBfI5SYMBwabS3PjjkasQQls7VbKL32ifneBiXCmUI41Ss5WvCZDsnu3x6xE8XIuUzQP81+iT4467yLtwPBa0mGp44Uj/dZophpJ55V1T1O32VEG/kFR2+5+JQkHF2slDT1uuoZEQ7WFepBqFN9Rte/ycjBbxHP6l0qUg== 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=uV5tVofIUhaWIB6a62Jfw4DnGrN5XABWK+wT58Hpanw=; b=AZzVrfk+VqIe3zRbvdLL9guCz5wiHFah2wBjODPwm1xQHahoHgYnuP+t6i55Le7kVuyclIiDPwhx0+YAfyF4Wvt8Hi52s2AvkudicCQAwnHmVvKA0KztyCUF1P6k3ABWkrzmjfGt8qDmIEhB9IK+puJKJi9gDCjie+k1T/Fnk5fWlV3BsfuLX6QaGn/ZI1rih5N1UCN579nf0egoc3RKmRsr+xTCdqBbHszt4tq7m7OK9lbmXMMPTVOTWn0WNujFA77tnkr33TFNp7OJdwdg0m3X2fQuGew1c+AFOw6AMYOIdkLfGVubvUT5GJVCAEehZQph8PuroCmtJv0jeQhAOg== 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=uV5tVofIUhaWIB6a62Jfw4DnGrN5XABWK+wT58Hpanw=; b=raQW6GxL83ghOhXKaaGfe9nHUnH1n6I39twmgqVQ5j0k5ej2ddc7HvtBk72PBLaMLLlQQF+EOTOrvZ/JTnoeSAkP+vDPk4OwCpIlQ3BA1ioqHCGUZk+DivTJ1S+kunQ1XwfOrxLb1z1AvhDfb1ivoPYOMoJvijdOGHVCnVXYwB9cKCztC0IIBKZQD8hk8CEvK+Oc94I/jmrovZtdpSjzXPIuNu1cnqAxQdTbcxR8iYjFPxIWwlumMlKj3XTm1UbvBYfQHebtWJqwNQcE620WtVjoSUHkeX1mzT0XXJXdwdH3OmR5Ig+l5oK+sZsYWeHAqrxTXNs2dq08vmwJLK84Fw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3192.eurprd03.prod.outlook.com (2603:10a6:209:16::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.14; Wed, 5 Jan 2022 13:59:28 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.009; Wed, 5 Jan 2022 13:59:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jan 2022 14:59:21 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [oTLW448KXw46AuRh4772Gr2/xkti+CJL] X-ClientProxiedBy: AM6P191CA0013.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:8b::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220105135921.2397322-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0572b301-0e27-4afe-b845-08d9d053970b X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEuBoyQUf2rHPVuupI3Je4ybls20PjQO9fcsERwPt1nQeIcV5+vvGnQoDFbP8Q97YtzxVtdccbxTa2JSfxf3uG5JXw3oQVpPBMUsxy6vov0l1twBcPbV5nV4+AX/DbZJ8WSVNYyEW5Mz+p2WyrL8NwXjsr9o+CXzPT4o1MGdDlui8QSKLTjmZV+6L3bf9ZPwZyclrGWU/z4duBwvu9PlZKLBNWIRoYhhq5//FEUc4rYaqFroLD0KKvvYUUxLjGl2aG19+dWtmXq6XDMXrIYOHX8dAnZgsiMklM+HnOYHRrnG0hMyTH4/1aWo17B2bRxel2fF4NFwCLceOP93aUh3YFrbZRlnaEP6f6pIt6wUNoNtuf+5nKT90+WXDG6Rfl6mTUzxYS3cpoPiFrZ7Uc24ffIUVcdPr6WNyAusOr8k7eMIbvRHBhOPQZ+awR/dtKUl794UEBNqaKnsqxGA+tci7/4h7ZLu4PKve2BWU3w3jSNc2+FvKqNLNgGQm/hbCnUNAvg2bXNJF62H0kn3L0mbtVzvaoiL43Y/FKmXZkSCfIiQcft3Dzk79AfbyoJnslIEOZ44N2SFSYplrRxwuuwlPH6p0/Bo7924Cd0NgcA7ebj1tA8n3jFTTzMVRrDPaouUnGq5XfKYsUkARdqzxO3dEawDxtLlyPWWiuoVbXoWtmR4t81/p7v+uVrSonUBdpFxu3cXWE9VdqEUQ+Ui44ey5vVDpN/1Uv+G4J6yfUomRUtNuod3zWna0xuXQRoyI7aLG8eEtDKjytXF3m2qYdsWuyz7 X-MS-TrafficTypeDiagnostic: AM6PR0302MB3192:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WMuJ0OdbrPyGBOt8hRQFeKyiLrzBO5UqWy5GAMp3bRfSUe0nUabLs7OcHI+apbtP6s3Xcc0MhaGdrtyfmVKGqpG1QYLFp1JJCCZOZjdIo/lAuKIGnnwdvrjwc2DYjZOxHYiTMkMl4Zt/7yqZAvJx4hscWiPVaScYlZs8o5YM0xwDOCMJ90Wbkko1qkP5dy5qKR4i4iNTui/5iVl/Tsq2+4LP57A6dGGx6wGCmdJVibCPl0Ks8r7yrSJpb1QZBFK2uzV5dnKxa00WbzlrCHcyXfraS7YPtp5jn4/MCyNRiNCi+WV4xrQbdfGwYT89inTC0TwtYutVomoxCo+37J7MRW0onDjQWHaej+DrZ8FQU2BQN21C/Hi7yT9ZQ1a0tHsowyIQTJ20OCy5cd/Ng+mHkioNd+8oKhjM/wFzy9aOGYXIs577gAr+BacQrdC/2NQvCvQv2hnRziFvFqCJuujdWhAtIHGyaiixlcdOCIShPwbOEs4Jw8Sfxm6pKZWf2Svojx56gH6+ZU4W11suKyeBSTEtAlt+1xKLInInZT3Kqv9hZhNPk3J8boGd1NIpyMjAP9rcGizIT3hwrpmUjP2LPg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Z5BPR70EhbdTpfMmc38E6yd/9Ih6bhW8Zh1LAIGCTqmtOzTOK0ZlD9PuzHLEKTzKq8p48kuz7OZ9QVuWVHa+nbSkYimERu+G7+lv/c9mKb4rU4joDodCExliAOOx7Po7t0U9j1H+SKCmLwIssPLmLQeWEd+Bm219F9MaRjtdzgmEmKDw9v8jSPzMfCz0groDB+0PkNBQCfhfrn9tcxRO8lE3y9q6G+NEE8rry9FwuBAcV2Kw/4+1MTkMrqIpSwcjmSM4Ww5fllogd06GvFEQqGrL+yHRkywSPO2W04oqkgiuNBJnvKLzmxRzLZLVmipPndgpCHWDjazx702XkUuMXLJ/mhKv84ZLWW8YBG2REOejt25O2vQa7HMr443JNrRKT65ecVRQVFgP5Jp2/WNBfGxULPpAnqwNSwR49oUbSer5faUF8nlKr67PnxE2O5+11QcEoVvSMipSCgGe7S1i8fV+gG2LrjoeImo3y3rDVwydrHQn0g5wppZJYdpYcqJNNfSxY5UX8OE7ZTSVj5Pf7nE+oNws64nktPM2+Fv8a+0sl+6j0A2hkr+cuyF+FuPh0IoonK4ZjClGLBEVhNazxNaOxJMIBJemXbwkgAGGoo6WtNMj3p4YRC4lTJrvvyLkr0zPJB4SkQ7H/l7TTFSEHMz1Wdv9unLU1/rXXAng3Knp6fDKgwfOFlcdIn9phbatQRHI30FFM6UOtbXa7jzUHfVtiIqXsNXyYuKPfFyRxtH0psJqm0J5byV7IC8jjkhJZoAW/LXskwi8bZLYJ7MZ78MoYyTU8Yw9NB23f92VZq4U5BEO93PT1T5/10/iW/WG37BBfux2rjsNsTsr8wScgxngL+lcaaHEsA91P6e0Y7o22M4tTQRGg3rnGvTbtcnuD8zfSWBZUcXREa038Z3xJWxg3dWtYHEuc1likIZGOsU1OjnY+JEj2MW0h0BBkm3JAUkRj5HiQjkclRQ2aePLxw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0572b301-0e27-4afe-b845-08d9d053970b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2022 13:59:28.8532 (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: AM6PR0302MB3192 Subject: [FFmpeg-devel] [PATCH v2] avcodec/Makefile: Only compile nvenc.o if needed 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: zBAHZlAjFTSS This fixes compilation errors in case nvenc is enabled (e.g. autodected) with both nvenc-based encoders disabled because nvenc uses ff_alloc_a53_sei(), yet only the nvenc-based encoders require atsc_a53. (This error does not manifest itself in case of static linking (nothing pulls in nvenc.o), but it exists with shared builds.) Signed-off-by: Andreas Rheinhardt --- libavcodec/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 995b2792e4..8c0c19ca27 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -135,7 +135,6 @@ OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \ motion_est.o ratecontrol.o \ mpegvideoencdsp.o OBJS-$(CONFIG_MSS34DSP) += mss34dsp.o -OBJS-$(CONFIG_NVENC) += nvenc.o OBJS-$(CONFIG_PIXBLOCKDSP) += pixblockdsp.o OBJS-$(CONFIG_QPELDSP) += qpeldsp.o OBJS-$(CONFIG_QSV) += qsv.o @@ -383,7 +382,7 @@ OBJS-$(CONFIG_H264_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_H264_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_H264_MF_ENCODER) += mfenc.o mf_utils.o OBJS-$(CONFIG_H264_MMAL_DECODER) += mmaldec.o -OBJS-$(CONFIG_H264_NVENC_ENCODER) += nvenc_h264.o +OBJS-$(CONFIG_H264_NVENC_ENCODER) += nvenc_h264.o nvenc.o OBJS-$(CONFIG_H264_OMX_ENCODER) += omx.o OBJS-$(CONFIG_H264_QSV_DECODER) += qsvdec.o OBJS-$(CONFIG_H264_QSV_ENCODER) += qsvenc_h264.o @@ -404,7 +403,7 @@ OBJS-$(CONFIG_HEVC_AMF_ENCODER) += amfenc_hevc.o OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_HEVC_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_HEVC_MF_ENCODER) += mfenc.o mf_utils.o -OBJS-$(CONFIG_HEVC_NVENC_ENCODER) += nvenc_hevc.o +OBJS-$(CONFIG_HEVC_NVENC_ENCODER) += nvenc_hevc.o nvenc.o OBJS-$(CONFIG_HEVC_QSV_DECODER) += qsvdec.o OBJS-$(CONFIG_HEVC_QSV_ENCODER) += qsvenc_hevc.o hevc_ps_enc.o \ hevc_data.o