From patchwork Sat Sep 2 16:21:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43493 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp255175pzb; Sat, 2 Sep 2023 09:25:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHgD2lXCV38NeB27oZwqAqR63t42uRCxMjf0EbQdnjyZU/G7nBXmVXPvhCotIqNDSwxVAdY X-Received: by 2002:a17:906:7c13:b0:9a5:cf23:de54 with SMTP id t19-20020a1709067c1300b009a5cf23de54mr3340761ejo.38.1693671910583; Sat, 02 Sep 2023 09:25: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 ja8-20020a170907988800b00965ec09592bsi3964971ejc.817.2023.09.02.09.25.10; Sat, 02 Sep 2023 09:25: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=IUKTfXXC; 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 2A6CD68C7DF; Sat, 2 Sep 2023 19:24:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2086.outbound.protection.outlook.com [40.92.90.86]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9CEF768C7CF for ; Sat, 2 Sep 2023 19:24:49 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CWrTNTECbeRyv3fQKmsbmYJVOETLYI5q7HscVMqTEJOQ9qhD3JRhapTdqYjFkiSVrI6PXWAxuxIssNlPYGn15xDsxHoXuoE940gXqjSq5+xO7XGCofhG7X+aqzsv+tbDQfu2geTW1hvGFLmKEZ0RAmrJy9b1sERBFQIzCtCTfM5CGQk5aZCVEG3WElXMFPF2UnraWdy6pH793nI1UXXm8VQ2OovrCDTCylxQx8lcwPLMxkbFDSgce8zUVawltjqQnxkttVcASjrrfxjs69DmEa0j2SoVaTMV+clp2pL49gFETP890M1iGvpLNzwx1yreVmMXMy3FOubiBVks5slDqQ== 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=2MuuV2q6GSRUwiXBFPK8iTU/+kafv1NOJ2PP0SwtsYc=; b=BusnAo25OTSIUhnOKUGp3ybj3rGKcmJERikwac6DFm7+ydLIEINyGyU6zFQ5Eo266AX6KU5zlVrr7LWZg+jdEgLNrZ5cxEkIeM/CRksMskD/oinntljc7myHtyzBYHstL26UAREhP5F5J40cFRMi0SZZJkEUgk333OAQMS5UfUOGYNPnQuHzKY795sng40TWzkwb/QtVgqYOcryvP/zMKW+DTDJvj68L9poxv+vrcoeG8bfsqlPdK1wY6yFs6lo6XXGhWbdgC0QdhxuVQ8OdEdgSNxWZPe76ARwoBFkRQwmccfx6pwiyJ2LBZvGWuJ7myAFOsQHmgGVXwA4GsbuG+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=2MuuV2q6GSRUwiXBFPK8iTU/+kafv1NOJ2PP0SwtsYc=; b=IUKTfXXCzsYjDRU6ImCV9pduTAzXV3Qer27EZusdl+KCjbqpFMFwmOWFpIAxYqEZK2jGH7Tam6K8z/4n8H9+izfezHFs0pFMvnEGs0aw6eCwxKYR2OKSc+cdoaiwT/Z3hzmsqcjqR1QLlNEAPliCNc0SJ+z6cTfhtk0ftwhqPyTMe95uT9ogTFLeJZMElJc+NCFjOcUc5gCmptPac3P6X5yXwDAdIN5B3+3xUpzFgqkkpQBtRgHUz5892s0IWnVov9g7OXxt93PlKYRCJLH0r/Ag/jhdPlKpeTkcJLHmlQqAliIho6JhgjEUr2Z4SO+vhsHnPMApfPFsgNSGKoO3aA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0272.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.28; Sat, 2 Sep 2023 16:24:38 +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.6699.034; Sat, 2 Sep 2023 16:24:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Sep 2023 18:21:40 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [zCqEp9vlGz3X4tXhFhbAO8VyXjyR+TUKLn8M16QlHGo=] X-ClientProxiedBy: ZR0P278CA0071.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::22) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230902162141.1294387-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0272:EE_ X-MS-Office365-Filtering-Correlation-Id: 3176ad3e-4ee0-4345-fb8a-08dbabd11a6b X-MS-Exchange-SLBlob-MailProps: 0wLWl8rLpvuzPRaje3DTN3aBBcx7rvSmGApVZyEh1d1opD5ekKFJEtX7rsw+AiJzSVCB3mTFHJPerB85qU7aYNZf1us874HylLvd+j9jj/ibofw0kUeOufvk7pA1/ESs72dzcqEItmc2+5GhvyEd96IJMEwIMl3t3nBWBKf6yMvVfPdmdTlwELIiHtXsHT/b7v+ExEWDaEbcz/gdBZVZN/rrGN+mTUYkbvetA70rwpt2FjaahiUOyUcmU2g3SCNtZquv88fLRsULh3RHpACkZ1NVfXMMskCfqQdf9ocYiA5YugZY3XJNzEW8bdVRrluIciCFJlRMKi+WbtXMef/PR5xvOH//MeCebWImPR0RsWm1yqj50DEfRvNDkuXdplQ2b7J6ah74vXvicWdjiH6BoB39hTIa3XyG20M/xw5XzwM+q2iRXp4xam1e96LE2fbwV4JNPoyDdHNI61CeqqXGm+QOgqMzIxVTd9U1XT8Ah7IDm6xF0UGxWw80HChHiNURPipFM8fLy39m8p9oDAAZN9n3kvfxjec5MiA59DU5TIhLFl5t+IKDntb6IqQmxFGoSyqliUpaGJ18rBqoxv8spGQyXBMT+gqSmdEfnNQUOO+ucrSPQZEA58jkSL5JVrKYVVASDtadYtbw5C2hkyxBlvnRfE9f/qg2r8l0gfAl6aD1nvLCSZFIBr+rlPoWCYxia/29wT9IiFUJHZc27oHSbyPjdAcRPpm3MD43r1gOL/XyVs4RngkL7ByjE+1ADRD+PCcy+NdRvmY= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DC3+SdgZ7bfZyREdmvqikjFMayQtc33xsqVRVnjcbYaqHFnrmcg57CYXx9UJ3k6sVRFbCzgAfodLwjsjyv95Sb6775IkBQ72RjAuKOTNFtBSucTS57VqUXIs6f1uBYFeLsQpNIRgAxuMIaKYTuOVn8H3ee2HVCVJu7thefcEhjrtHCTuuQs4HDP4rnIwKrfAdvBNUn6Zg3Eq8X75ZxfwbeELykBWvAorl6i+dxIh+RgtikLlees0+U9Z1quYX66Nqa9iIz48meU4rcJxgznHnWbok3dJ2dzujimI+c9sEynkLJr3cHdJT3o5jb3SnT/gSO8Vgpd6LrhOFRH8rapb5ab+3bxXbrMq5xM3/Nz5w4eOFq4vnqdq6mB1W09cY6gWRx9lc9Bufwknzd9lC00wVu92WBtmqkr6Z4Zj1B+BPmMdRmVuZfO5fFU0+Bq/+P4a4PvCyzMDkDUhJ5Tkw5/xrznqUvoi1xLG1qH8b7MsutzpPF1/6apD7PVjCYEod9I4i3TBzmp/7p3uSslKhJR+RC7LJdhfUBC/tHzYS6SMIJ5laYtP17MRT45hHK0LT+iDABYg4TP4FjICW6tSU20+C9BxDNEKI41geqIuruxcNm8MEbJoINTFMreMp+BnKW/+ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NpAjGwvEGO2wq8rSOUwxXiaO2NFq3o2Zf/Y8NvySFWGWMkLeOWN2mbXnKUC9c5LziE8F0Nmj0pI4TUaPYPPm9eMMm32KaChbTW9ttIYAw9tdiF7twd5d7OveUDF7aj4EOljqwiTBdcarjybWb2syFaOK8+qkOIlxCoc3oW0wOuvMpN2qQyS/Ao4N4d2qny3EUwqP62wp8XcSQoAQ6llyZ+uegijMhDaJ+vvfQaHx0vCo3vmAMgC6/P0jZxR9G87NZHm0khBd/MU2u1qA8Lu/u2pY91Y55nkKFA0wkbmL5ryoOkusKOKAf8DaP2FgcIxNrMxMyW4cL/vHPgrhG4UsQFbPdSDYn1U1VRqoqjNBCn8fndxV7lpj7HtHcv/QOYqoWQLB9WznOSKQvUcE/UapnWWZ8sSZerVf+EXnWl/TEmTauqiTM9xfBiGeUxGHu+W17A0Yru1m0puhZVNSX9uikawboI4soQJ+nsC+jzuRY12GCWDNhS2/M/EPH+oo1RAPduviQEyjAFMPeMYP6DUeqVW+A6u/xFIquGxuccYHtMYY6kwmpsQXscJtalLGBQnhfCaUsS8Kpsgqbie5tbk/8/KyG4rKp1uLqwfTEQrmWtLpjVPALDQVi0KeXa5E8FvToz0WmXnOAPfBjzn1WnAeXdTzwVXsJv43zEBJIMv52hOnbWlC1dD2Evqxn3jP+//xyR7XSCiaxeAfmhETSZYPlif24x2EViyr4byC+F30aVc1KZ+y5v5TNHsUFBeoCloE+aoOC/dapPojTcpbvLq5PVBb1Jdm3bKsGGyoyXm68Hv79mZB5AwTYHGk0xaLMF4God9QBeQB8CU73PuBA+8WpAAAf+/H4YKqqadzmeASpdGgdivcc+ZtCwlKdBmm9oBBSHtyNlAvcD9bvTMvmnhooE14P+6UMDpZp+P5iGhLONAuvW09pbL55gIKgGjDedU4xQzL0fVVhgf38jV7Ez/9FyY0+S6taQ2Fl/avxDX7WV11cxGLiQuM7TUEJ/unPXwKU7OK1xCWC74+wYCmmd51gEMiITur5PSEqHDpv7V4WbIDx0VLr6HIpuunLmDQx8wMkwcwpD2ZN6Ez0gLuuOVznC3ttv2NQ383aiWunS/iCvQmzK6LpBLfwoZxVz2hwUl9fMEGTAO+q+9Kg55OxtUeNrnVb0vzIogkCMGUPuIk/hCKL2KBlzlM3KuzmHDAFr/G+Gonf9HVrBHDVjtgdj2Vn7KBtnT/aZ7VIncdv471cZIqsHSNZs9PbY6FM1Dn+Ywt X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3176ad3e-4ee0-4345-fb8a-08dbabd11a6b X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2023 16:24:38.5353 (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: DU2P250MB0272 Subject: [FFmpeg-devel] [PATCH 6/7] 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: E+2O2svahgOf 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/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 + tools/ffeval.c | 4 ++++ tools/zmqsend.c | 3 +++ 27 files changed, 54 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/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/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"