From patchwork Mon Sep 4 14:17:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43529 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp1242470pzb; Mon, 4 Sep 2023 07:16:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IECq9b3x2s7VEUw6KxvNbpco3p/N3UG46au3fVUV6mZeEOCibB0D0YvORDyou5x8OMvX4ek X-Received: by 2002:a17:906:29c:b0:99d:ddae:f5d4 with SMTP id 28-20020a170906029c00b0099dddaef5d4mr6364023ejf.44.1693836989754; Mon, 04 Sep 2023 07:16:29 -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 s23-20020a170906c31700b0099ce38d877fsi6285507ejz.30.2023.09.04.07.16.28; Mon, 04 Sep 2023 07:16:29 -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=Asq6OtDg; 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 6D84868C68A; Mon, 4 Sep 2023 17:16:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2090.outbound.protection.outlook.com [40.92.74.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 64BD968C051 for ; Mon, 4 Sep 2023 17:16:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QjPHve5dF3o99cYgTm5bxZhU8h6ORAbCJekeFOFQccFW14gcsPLBy098Agsjnu3IoSladhKTnoFsV7vsluQt/difPeCFu0Gp2ZzMOPOsHXvKaMVNlkqtrwcfYT04bop8fzbGNcWSreW5KSiB08lRsixCviNBim6VtFoKiYKk12GbGTZlbqbizk95MjiF6pUACw0nbJcB039sg4/LwLnCqeRoL91nbYzdmFfGuwXehncR/+RvopcFNbJZmmSOSxQwlItrACu3HomR7naKlykxrHvOiqLF3AvpYI8tyPjCJ50uTWQF9T4kn76ZaOhKfRfSrgJVLcehUMtW2ebzr5xafg== 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=22Cgl6vYG7EAviNbOZUvj6RsKBSQ199lEPFoitAekQQ=; b=P9k6jRvjHghrYdGKuRJm2my9Szbzqs3uRIkTneSkwhz7mjJtCP+PhMaxNziWmPweDl5YhI+i+V/LvPUT2J1GxnhYPgiKpciO8sCgv2sYeAidGlF2x4jV4cftR7xfW32pV0eLSYud2MJBj94vPiyC3YYWDO7v5P46d5Cvc1EwsMlkgnkP/pFA0hkyl0lvRmiYFIxaNicWYHlTSOQvAh75zcLwKoCNFx6PYrwlCu9MjtRvvoHdNK4zwdnSKA9oyu9fVejdszVSvGMN8JUqhADXvDN8irs/e8W+6wzW1kX1WO9MJpsW7iX+T0BkfkunNG7pYeXiVqmKoLjmPtYnR2AI+A== 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=22Cgl6vYG7EAviNbOZUvj6RsKBSQ199lEPFoitAekQQ=; b=Asq6OtDgyKLsmJRsG9nybXtPNemQTm1mmy50QAy7o4U1z/N3uozKH5oXrYJSwBbN5fOSQRgmeR5n6NuLAK53xuNUhU+KfcaE77e3PMec5rwxr8mG3esw38YOlV7C3wPUT97Yf/3LYDtA3dIBceOzUGPogIXfoPr56XxmnUztLyR7xLirCAcwQMEBgsOIKpZa43uEGUqdR32PWVZ0IFtT9x29PQ25IC/YKnamCuEgg41b27f4u4NOjedzuoauAx7fHEGHhX7prb/LIdbtPiYUXG73pCRQtmGbmDiWOlSCxgwpoU2f3QK6ZT38/hL+vBjXyPCdjvhTXJB816CfA6rhlA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0214.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:325::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.30; Mon, 4 Sep 2023 14:16:16 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6745.030; Mon, 4 Sep 2023 14:16:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Sep 2023 16:17:28 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [AWuNgmu+qILQ7ZFsUvxuntMf9BR20mw7YcqTFBUaeV0=] X-ClientProxiedBy: ZR2P278CA0083.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:65::9) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230904141728.2841550-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0214:EE_ X-MS-Office365-Filtering-Correlation-Id: de42db34-9090-4884-ae07-08dbad51808e X-MS-Exchange-SLBlob-MailProps: 0wLWl8rLpvtlEyItUpZmgcVwb7bYSzvB+ght6kQa+69Y1IhRvL0aFNnhqAx3RBCx2Bq3ZauL8aBEDBvtLPnuZAUPGGyhPzcIYs2X1E2eRXpLojpfew9mA9mjfTkmeM18BALpAjyK9nHXrgpqRQ12COGrsyQhwOsEJuJMgx/UaJCBjo001e/Pn6V+PE+TuqdHBCg+w+YF4pfTL8KyiOFqTLP3j6XejCZLWpp91AJUA0d2QRy0IRffroXsXmFY88b04FLnspfYrKzvNv/qGZw2SIIpjQwtEnL/ff/PDLCfiLL5PzMW7Rs6DccQc6KqAWXbMJ0O+plw8dXNZnGfNQ2FyXBuc9SXwCf1b9ILaq3QROYOQtngA61wi1PROPPCmmPM44kDd9CDf4otf+2IScVXDbsGhGwwTIPya+D2+vW9FAkVpfxDSiMV2FezN5PF0RJzaTQZwdXgIPq53y1tuXJYapBhPmox10Q03ybOZeabstxDommgiu+DT3XAkMzkVf/Dv0icUJiEM23E38nx3K3H6D+I6Tm+/Z4/bId00Tsk0AEI8em36mlN45rnTF0i03Yj+oh2tbzGK/vtSZReQRM2kX5ZJ/5+zDqPy4ZL3ple467J47VGxZFH/ndLccxoGgz58SSHNRSHMWD9zZY8BIqDvzGfJemA5oGK+bVK1ryTdjyzOyaemDUBu8amNnlAXRJZUqLq3XjB7efGdSfxeoMSx0gRfHuDtabkFupqJ1N3nRzW4Ypb7zKY3Y+cuio20djHiI/zk6pqClg= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OJ9IEoXU/VY/W0uYv4Gr52kKdwKRqRF8xJBaZRrO74On/ycshrU+rO2TrPC5hDG9Z9gDKkT1B8qugjlfSAKx5tPB/8kLQWrX7oRsMkM5O/LmYRXvl/aXFmaOkAnzIXjk2zRylprxPk7MBYqMYWSPFAs0QuARQgOWKZtunDoBkzTND96yHmNvtNw5UczwtN0jVjyLLK5FmsbLrEMebcMR4n//5uliXCrBPi2r9jwd+OGpjXgC3QiMgwUUaahwW7zVk9k129Mb6/8G9ShcaUCBzSMlVLpW3AmtAippj4+mdrjaUzj8I2f++qSpcllg2INjRih9gtMVmwvN1DDwPBOnp4GYSBFQ5syFIlulJov39C9hHm1/0kKyVW+Br6Bibud9/zU8MojdMK51u1C3I4/fHSDfT5ONu7sT1H2E0jimJW0NSPnFGHxyo+iiW+vju4ndJiRUg0BZt1nxpYVLqhzx9Rpsk38Tpvz0ULSV36UcXjZpI7J23BSJxkBAEBmxYiv6Qf33Xu6dYturTvjGNYxUB7Ds7qTBBL2MzcCH6u7vZOdK0WHFfFoOWbVw5Nnz65x+3xpGkJcXwi3sei57Yfa6TNM2xArxfYkj6EN4yGwiDxECL6KeFyFmL3aL29emMcm4 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2kvXms9AJnIRIfHm0AzGNk2Fa2T+zIVaEla+XRtv0mpzijv8aiY/bykGRiCEt1T3BQmDCJ0FHPzGahhJydqRMlpojsvlwy6Dt0YvZqU0t20eRJ7yxX7kK5KHQGEkQGNudAEME+ymXTMjf6C0zDjyjOUmPRIghOajfHhe/cXvKOrkLOiyEUqovLBR0teldJMoFfXd4CGeji2Evh6j6mjCAmMIk7t7cyi7lh7A1sS9hor8Cfs+hvUrsX/gtQ74HYcPEPTHYCDwSQhq8Uott5vYvpjZJ3AYXtpmSkIu+OGQxbRfPJRE7ymOkVLHQVqSUqytMSu9sploPqaUkFkuS7OtrtIzG6zG4ldS9fn9X1kXhePSt+QiarUAPgTSv5Ns/abckAYVTjiJZqVRunPw5c3PX4SPN50V2ZFxpNPKaZgQRgQP2eFz6vf5WoWNmv6eM199nqkOlsLKvXKt6wVbTMisWWFzHwdtBGWhfgOz5TIv5k5ZFsi5wKe2Pm1aLBPnztBZbJllGakIcnNAkRuDC6k9z/BDLuKt5xU39E3N4A1s/iFtCLd1B3idBzCQplZQx/qIkeqEEDqE1FTquor1LJvJPXbtYHTqKKeeGHg26b3mWGNmqy3Z01DIAljt46H9eowO1iMpSXXmi3g+P3Wa48IE6tZCrvMqbgrqKmiqx7RBbr89/rhFZOQ5AuolfL7lbRCcb2vgV78vAvro3vKb0M6aFvgeTBNtzywwCmEa1SWF431oDlBs91pRYU1KBnupL3VMUiJM1mSC0N37SDgGh3nRtyA7cXQ8kpozxi+oEY5/1ZrxEAbC8Zg39E5Iv0NN8+bvy2f8+x7mZpNQZzjWeKtS62rDYiQGhCBxPaP8LvvK97j2XQwE1W/9/tdg6PJL0lKbNTFbBBPZVH0JI7kTfz9PilJ1UiUW+gOUoA+ulSdaI6EaM11hWCl/fMOpznbHWGDGPdr5V0pw6OxBYCiEQ2LfIvzwqX2y1vt7uJHDLnnPZeR0oqiTbH8qbuU3BUXjvAaXNH1AuLng45qLO2XsUWdd7S7VEwYxj6y9eDREOM6HHHuguuhWCxsByhpmPfTuzteoUNEyn1ppGiotBjMmpdXWkjw+lLwCQoHxuuDBOj4da02I7lltS2LhuLXcG9vHF75ltlmbp1HozGZfXClKV/9F6IA1zqHWKudrSPZAIA7J0TJhigPAokRLuRjfQpR/I6wb8L1dsRTmAHV345B+rRR9hRDasF4g7AMmN012wZ2OGey473jwCN6IuoU39YVlREvS X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: de42db34-9090-4884-ae07-08dbad51808e X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2023 14:16:16.6489 (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: AM8P250MB0214 Subject: [FFmpeg-devel] [PATCH v2 6/11] avutil/mem: Don't include avutil.h 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: 0GZJiG58gwrd It is not necessary at all. So remove it. This also breaks an inclusion cycle mem.h->avutil.h->common.h->mem.h. Signed-off-by: Andreas Rheinhardt --- libavcodec/avfft.c | 7 ++++--- libavcodec/avpacket.c | 1 + libavcodec/dirac_dwt.c | 1 + libavcodec/ffjni.c | 1 + libavcodec/iirfilter.c | 4 ++++ libavcodec/jpegls.c | 1 + libavcodec/kbdwin.c | 2 ++ libavcodec/mpc.c | 2 +- libavcodec/ppc/mpegaudiodsp_altivec.c | 2 ++ libavcodec/tests/h264_levels.c | 6 +++++- libavformat/protocols.c | 2 ++ libavutil/dict.c | 4 +++- libavutil/encryption_info.c | 2 ++ libavutil/fifo.c | 1 + libavutil/file.c | 1 + libavutil/hash.c | 2 ++ libavutil/hmac.c | 1 + libavutil/md5.c | 2 ++ libavutil/mem.h | 4 +--- libavutil/murmur3.c | 1 + libavutil/tests/lzo.c | 2 ++ libavutil/tests/murmur3.c | 3 +++ libavutil/tests/pixdesc.c | 1 + libavutil/threadmessage.c | 3 +++ libavutil/timestamp.h | 2 +- libavutil/tx_priv.h | 1 + libavutil/wchar_filename.h | 2 ++ tools/ffeval.c | 4 ++++ tools/zmqsend.c | 3 +++ 29 files changed, 58 insertions(+), 10 deletions(-) diff --git a/libavcodec/avfft.c b/libavcodec/avfft.c index d07c495022..fb635abfff 100644 --- a/libavcodec/avfft.c +++ b/libavcodec/avfft.c @@ -16,13 +16,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include + #include "libavutil/attributes.h" +#include "libavutil/macros.h" #include "libavutil/mem.h" #include "libavutil/tx.h" #include "avfft.h" -#include "fft.h" -#include "rdft.h" -#include "dct.h" typedef struct AVTXWrapper { AVTXContext *ctx; diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 5fef65e97a..9ec1feb068 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -22,6 +22,7 @@ #include #include "libavutil/avassert.h" +#include "libavutil/avutil.h" #include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" #include "libavutil/mem.h" diff --git a/libavcodec/dirac_dwt.c b/libavcodec/dirac_dwt.c index 4039899cf0..d473f64daa 100644 --- a/libavcodec/dirac_dwt.c +++ b/libavcodec/dirac_dwt.c @@ -21,6 +21,7 @@ #include "libavutil/attributes.h" #include "libavutil/common.h" +#include "libavutil/log.h" #include "dirac_dwt.h" #define TEMPLATE_8bit diff --git a/libavcodec/ffjni.c b/libavcodec/ffjni.c index 154be9ae99..e3cf24d3e2 100644 --- a/libavcodec/ffjni.c +++ b/libavcodec/ffjni.c @@ -25,6 +25,7 @@ #include #include "libavutil/bprint.h" +#include "libavutil/error.h" #include "libavutil/log.h" #include "libavutil/mem.h" diff --git a/libavcodec/iirfilter.c b/libavcodec/iirfilter.c index 903d64e8d4..727a370444 100644 --- a/libavcodec/iirfilter.c +++ b/libavcodec/iirfilter.c @@ -26,8 +26,12 @@ #include +#include "config.h" + #include "libavutil/attributes.h" #include "libavutil/common.h" +#include "libavutil/log.h" +#include "libavutil/mem.h" #include "iirfilter.h" diff --git a/libavcodec/jpegls.c b/libavcodec/jpegls.c index cc598f3c17..7b4bc30e46 100644 --- a/libavcodec/jpegls.c +++ b/libavcodec/jpegls.c @@ -28,6 +28,7 @@ #include #include "libavutil/internal.h" #include "libavutil/intmath.h" +#include "libavutil/log.h" #include "jpegls.h" void ff_jpegls_init_state(JLSState *state) diff --git a/libavcodec/kbdwin.c b/libavcodec/kbdwin.c index eacdb46774..ff7a7d614e 100644 --- a/libavcodec/kbdwin.c +++ b/libavcodec/kbdwin.c @@ -17,6 +17,8 @@ */ #include "libavutil/avassert.h" +#include "libavutil/error.h" +#include "libavutil/libm.h" #include "libavutil/mathematics.h" #include "libavutil/attributes.h" #include "libavutil/mem.h" diff --git a/libavcodec/mpc.c b/libavcodec/mpc.c index 6aa3e80927..46cb967cf1 100644 --- a/libavcodec/mpc.c +++ b/libavcodec/mpc.c @@ -27,7 +27,7 @@ */ #include -#include "libavutil/intmath.h" +#include "libavutil/common.h" #include "mpegaudiodsp.h" #include "mpc.h" diff --git a/libavcodec/ppc/mpegaudiodsp_altivec.c b/libavcodec/ppc/mpegaudiodsp_altivec.c index 6794ed0928..b065203c4e 100644 --- a/libavcodec/ppc/mpegaudiodsp_altivec.c +++ b/libavcodec/ppc/mpegaudiodsp_altivec.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include "config.h" #include "libavutil/attributes.h" #include "libavutil/cpu.h" diff --git a/libavcodec/tests/h264_levels.c b/libavcodec/tests/h264_levels.c index 98febcc41b..af3bfe01a6 100644 --- a/libavcodec/tests/h264_levels.c +++ b/libavcodec/tests/h264_levels.c @@ -16,7 +16,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/common.h" +#include +#include + +#include "libavutil/log.h" +#include "libavutil/macros.h" #include "libavcodec/h264_levels.h" static const struct { diff --git a/libavformat/protocols.c b/libavformat/protocols.c index 9491dc7d00..360018b17c 100644 --- a/libavformat/protocols.c +++ b/libavformat/protocols.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include "libavutil/avstring.h" #include "libavutil/log.h" #include "libavutil/mem.h" diff --git a/libavutil/dict.c b/libavutil/dict.c index f673977a98..7f23d5336a 100644 --- a/libavutil/dict.c +++ b/libavutil/dict.c @@ -18,13 +18,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include #include #include "avassert.h" #include "avstring.h" #include "dict.h" #include "dict_internal.h" -#include "internal.h" +#include "error.h" #include "mem.h" #include "time_internal.h" #include "bprint.h" diff --git a/libavutil/encryption_info.c b/libavutil/encryption_info.c index 09486c4c85..e4ff015b37 100644 --- a/libavutil/encryption_info.c +++ b/libavutil/encryption_info.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include "encryption_info.h" #include "mem.h" #include "intreadwrite.h" diff --git a/libavutil/fifo.c b/libavutil/fifo.c index 51a5af6f39..9b32f708fc 100644 --- a/libavutil/fifo.c +++ b/libavutil/fifo.c @@ -293,6 +293,7 @@ void av_fifo_freep2(AVFifo **f) #if FF_API_FIFO_OLD_API +#include "internal.h" FF_DISABLE_DEPRECATION_WARNINGS #define OLD_FIFO_SIZE_MAX (size_t)FFMIN3(INT_MAX, UINT32_MAX, SIZE_MAX) diff --git a/libavutil/file.c b/libavutil/file.c index 6a2f3aa91c..cc17885bcc 100644 --- a/libavutil/file.c +++ b/libavutil/file.c @@ -17,6 +17,7 @@ */ #include "config.h" +#include "error.h" #include "file.h" #include "file_open.h" #include "internal.h" diff --git a/libavutil/hash.c b/libavutil/hash.c index 9a49748189..12333982fb 100644 --- a/libavutil/hash.c +++ b/libavutil/hash.c @@ -20,6 +20,8 @@ #include #include +#include +#include #include "hash.h" #include "adler32.h" diff --git a/libavutil/hmac.c b/libavutil/hmac.c index 7d241fc73e..302d7b04cf 100644 --- a/libavutil/hmac.c +++ b/libavutil/hmac.c @@ -23,6 +23,7 @@ #include #include "attributes.h" +#include "error.h" #include "hmac.h" #include "md5.h" #include "sha.h" diff --git a/libavutil/md5.c b/libavutil/md5.c index 0170d8dd3f..c01820da2d 100644 --- a/libavutil/md5.c +++ b/libavutil/md5.c @@ -31,9 +31,11 @@ */ #include +#include #include "bswap.h" #include "intreadwrite.h" +#include "macros.h" #include "mem.h" #include "md5.h" diff --git a/libavutil/mem.h b/libavutil/mem.h index 62b4ca6e50..ab7648ac57 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -27,12 +27,10 @@ #ifndef AVUTIL_MEM_H #define AVUTIL_MEM_H -#include +#include #include #include "attributes.h" -#include "avutil.h" -#include "version.h" /** * @addtogroup lavu_mem diff --git a/libavutil/murmur3.c b/libavutil/murmur3.c index f2e2a9ea6c..c88a236a0c 100644 --- a/libavutil/murmur3.c +++ b/libavutil/murmur3.c @@ -20,6 +20,7 @@ #include #include +#include #include "mem.h" #include "intreadwrite.h" #include "murmur3.h" diff --git a/libavutil/tests/lzo.c b/libavutil/tests/lzo.c index a5655dbfc5..d7a78a1696 100644 --- a/libavutil/tests/lzo.c +++ b/libavutil/tests/lzo.c @@ -19,6 +19,8 @@ */ #include +#include +#include #include #include "libavutil/log.h" diff --git a/libavutil/tests/murmur3.c b/libavutil/tests/murmur3.c index b8d6b1feee..7a793dac47 100644 --- a/libavutil/tests/murmur3.c +++ b/libavutil/tests/murmur3.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include + #include "libavutil/intreadwrite.h" #include "libavutil/mem.h" #include "libavutil/murmur3.h" diff --git a/libavutil/tests/pixdesc.c b/libavutil/tests/pixdesc.c index 34e2bea932..b13aba598b 100644 --- a/libavutil/tests/pixdesc.c +++ b/libavutil/tests/pixdesc.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/log.h" #include "libavutil/pixdesc.c" int main(void){ diff --git a/libavutil/threadmessage.c b/libavutil/threadmessage.c index f0e23f28fc..20b3882033 100644 --- a/libavutil/threadmessage.c +++ b/libavutil/threadmessage.c @@ -19,6 +19,9 @@ */ #include +#include + +#include "error.h" #include "fifo.h" #include "mem.h" #include "threadmessage.h" diff --git a/libavutil/timestamp.h b/libavutil/timestamp.h index e082f01b40..9ae64da8a1 100644 --- a/libavutil/timestamp.h +++ b/libavutil/timestamp.h @@ -24,7 +24,7 @@ #ifndef AVUTIL_TIMESTAMP_H #define AVUTIL_TIMESTAMP_H -#include "common.h" +#include "avutil.h" #if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS) && !defined(PRId64) #error missing -D__STDC_FORMAT_MACROS / #define __STDC_FORMAT_MACROS diff --git a/libavutil/tx_priv.h b/libavutil/tx_priv.h index d5ff8e1421..d3fcdbf563 100644 --- a/libavutil/tx_priv.h +++ b/libavutil/tx_priv.h @@ -22,6 +22,7 @@ #include "tx.h" #include "thread.h" #include "mem_internal.h" +#include "common.h" #include "attributes.h" #ifdef TX_FLOAT diff --git a/libavutil/wchar_filename.h b/libavutil/wchar_filename.h index 4f87e6f88b..868a30b532 100644 --- a/libavutil/wchar_filename.h +++ b/libavutil/wchar_filename.h @@ -21,6 +21,8 @@ #ifdef _WIN32 +#include +#include #include #include "mem.h" diff --git a/tools/ffeval.c b/tools/ffeval.c index 944f374727..0a925b390a 100644 --- a/tools/ffeval.c +++ b/tools/ffeval.c @@ -19,11 +19,15 @@ */ #include "config.h" +#include +#include #if HAVE_UNISTD_H #include /* getopt */ #endif +#include "libavutil/error.h" #include "libavutil/eval.h" +#include "libavutil/log.h" #include "libavutil/mem.h" #if !HAVE_GETOPT diff --git a/tools/zmqsend.c b/tools/zmqsend.c index f26fa9c1c2..dc5d426cc8 100644 --- a/tools/zmqsend.c +++ b/tools/zmqsend.c @@ -20,8 +20,11 @@ #include "config.h" +#include +#include #include +#include "libavutil/log.h" #include "libavutil/mem.h" #include "libavutil/bprint.h"