From patchwork Thu Jan 28 16:26:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25240 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id BD34244BC03 for ; Thu, 28 Jan 2021 18:27:45 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A11B768A71A; Thu, 28 Jan 2021 18:27:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C94EE68A6EB for ; Thu, 28 Jan 2021 18:27:37 +0200 (EET) Received: by mail-ed1-f44.google.com with SMTP id d2so7331086edz.3 for ; Thu, 28 Jan 2021 08:27:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RVU4V+Ojimo4LcpCwvYhv5gVHsxpb9Iu6O1HQRI48pg=; b=Hzq2WEgVaRtci91GCChKEiYGEIke93+C3gRuYulLfSmeJgBBcLfsYtpm8X2u2IqAWT J/KMryPKYfSsPm0hR4qXJclrE1d6ESKqQW5m2I4u+duEwNgVl4JfuSbH8XYYWNVcnhrV Q3YYRUyQ1v7AQaCbjK1sL3mfsDoNDZyJuL6hYzXYnB3Kk7++PK5talra5gpwwyqVBvws ClKJBez7PXmLfJrF0T6OLnc5mKaVBEx8a9J/s/6q9pBpkqCKfqlNZ6Rxec1abqCqD3kF 4NUadbhb0OHO9HJbzn07BIGP548DuOvpaggGZTyYlrnagjGV0uvEaW8OfnW2IrvIT5AW +onw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RVU4V+Ojimo4LcpCwvYhv5gVHsxpb9Iu6O1HQRI48pg=; b=nKGW19UAM2TMbHKEkTsoMKP4dQapHeB5qDXVE5+OofemUUelUSZ1p4OHglJ+GT4ud4 1mEDsOPssJozEc6HviJal9qklfSoNXsJbTQwMouZxR/HvAd0e0m089ZOSvAguvadRoif fvIxuu9sjTyny/aT6okZyzRt36G9KJMVa408BMxFp6JGDLNZGF27Yxe1IantleJP7sxg kJTgN5HR2CTayIh6pKrLNItR7/1hVZK2Ca4K6+vnX5tPaJjpgWKiSUC1JZ58o1wWmGIO EzjEgh+NFsJwmCqgoneJNYI5pBS/e84kDwCdyatolu46RnuuFyN9FDgRB8Jmji1FUH+O ePtg== X-Gm-Message-State: AOAM5331o9WTCK56O7SXE6+2tXfBhAHRIJ8mdYjhirxNX7jsSBz37TGN fTKiYOXX2YCnQtz93entZK3qHOdzpUQ= X-Google-Smtp-Source: ABdhPJzB9jRBraWUCoeLKl+8W1haTso1nWeVABT+RNSR9QAuaMV9nuPOd6xm9jnFezcuVC02A7XGUw== X-Received: by 2002:a50:ee94:: with SMTP id f20mr378319edr.222.1611851257143; Thu, 28 Jan 2021 08:27:37 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id dj25sm3185288edb.5.2021.01.28.08.27.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jan 2021 08:27:36 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Jan 2021 17:26:46 +0100 Message-Id: <20210128162646.2811269-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210128162646.2811269-1-andreas.rheinhardt@gmail.com> References: <20210128162646.2811269-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/6] avcodec/aacps_fixed_tablegen: Don't include config.h X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" It is only valid for the target, not the host and therefore it must not be included when building the tables when hardcoded tables are enabled. Signed-off-by: Andreas Rheinhardt --- libavcodec/aacps_fixed_tablegen.h | 6 +++++- libavcodec/aacps_tablegen_template.c | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/aacps_fixed_tablegen.h b/libavcodec/aacps_fixed_tablegen.h index 356fb8b293..8fb1da5076 100644 --- a/libavcodec/aacps_fixed_tablegen.h +++ b/libavcodec/aacps_fixed_tablegen.h @@ -36,8 +36,12 @@ #else #include "libavutil/common.h" #include "libavutil/mathematics.h" -#include "libavutil/mem.h" +#ifdef BUILD_TABLES +#undef DECLARE_ALIGNED +#define DECLARE_ALIGNED(align, type, variable) type variable +#else #include "libavutil/mem_internal.h" +#endif #include "aac_defines.h" #include "libavutil/softfloat.h" diff --git a/libavcodec/aacps_tablegen_template.c b/libavcodec/aacps_tablegen_template.c index 341bd44409..e70edf884b 100644 --- a/libavcodec/aacps_tablegen_template.c +++ b/libavcodec/aacps_tablegen_template.c @@ -21,6 +21,7 @@ */ #include +#define BUILD_TABLES #define CONFIG_HARDCODED_TABLES 0 #include "aac_defines.h"