From patchwork Tue Feb 15 17:42:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34315 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:90eb:0:0:0:0 with SMTP id a11csp511003nkf; Tue, 15 Feb 2022 09:44:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJxf/qb/fSOnJf3JANFmppCxFdTQXLUxkDjX0MqmtnUUfxrvLBucUVJvvEqRkQ7z6sNPe9Dv X-Received: by 2002:a50:ec0f:: with SMTP id g15mr58662edr.122.1644947063243; Tue, 15 Feb 2022 09:44:23 -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 a16si299795eds.228.2022.02.15.09.44.22; Tue, 15 Feb 2022 09:44:23 -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=NTAPHQq5; 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 E61F568B249; Tue, 15 Feb 2022 19:43:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2094.outbound.protection.outlook.com [40.92.91.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5187768B233 for ; Tue, 15 Feb 2022 19:43:30 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TC8Uat37aKF3HXwjLkVcrlKqR1+o6mXJymApuveWPb8b4tewRI5cyuslzleLTBPEElyg5/kgC9aI9DgvoA6yeLY2mvbnKOM17sNvFyvu2tRJAPFTaahhCecjDFK75XaVRljiZdQDfcVSrw3dzpZezXG1xvMY7uVkTxj2j+Hfw2ZeFhcZwVa+NWvhZpgqFWvu+7h30u65nSgC57uaV0yd5rlSOwAIC4sma1rLNx896f4xKjSoCzW5QfLyTyZuBJDtDmzsNFH4eSVcb54Jql/2CFacIIH8cV3UpjyFSwQbZpwsjQOXaaXHm4+/MBgNBIVS5L5ARKf+dGDsZIYgUBXq7Q== 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=y/RngW0xRL/Gz8PVYb9SsjrNv5QVh9FL7TOP6saiP+I=; b=eiwL9WZgC2f+b5m/L5h4FlVY2c2oXcwcw3thsIRe0irhd6BH/572v5X/fHN8twTcaYdHKWNg1LDljnLCxtKMwN89g2QA+kjxaRkheuoeGJb2PJ+Ig68lbRkLrTteI6vfV2McfTyiRSZyMc0HtKB2YAfl2LfVoBTciV56rmGGBqxeWw4snI2PRw4FuuMxDTLnlEajNcjOswrvuOS3s73wyHr3B/Cyz+RSCY8cHj15cmkHsnb0BfIbVVoEMP3pouskth1upReY/uEt/mzCjdOKHAZTNipEm0DjspmLnllj6YC+9GdVT1KqpFQV3+zCnO5gN2ElP9fnc0917sKkFjRAEA== 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=y/RngW0xRL/Gz8PVYb9SsjrNv5QVh9FL7TOP6saiP+I=; b=NTAPHQq5+7U2hJzpa1lpKKtDk9hBEJJ2dF1a/VZ+78Fp6+Zfwe6e+MSVBMdIk06viIFWCFTOrRUeti0X5miBFw+Hqx7U9WmfzDV7oBF/ikChM3vX/wAaXWUp51Pcv4Ly21go8mU6Xxnoa24ogiVGPc+8woQFKlpexS3O5v5XTqJqntDpquUcndvjMs0IJPODhdiM9ps1E4xBYGj7u1/MPgOiwokxW25lfrPWrB+K6mWL1Vx82ak15PksS9SIQL6rwYreyHqjt3B95YeLUlj5wJ26JH8AbWcgFarl0YltSyiqjpTxJLdkpUXrLYqDd/ran+DqXhEHZqwd8/P4+wHzlw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB6PR0301MB2533.eurprd03.prod.outlook.com (2603:10a6:4:5a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.19; Tue, 15 Feb 2022 17:43:29 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%5]) with mapi id 15.20.4975.019; Tue, 15 Feb 2022 17:43:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Feb 2022 18:42:55 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [z5GccG0jaguLIA4nqwDm6zrZUmOY9QWQ] X-ClientProxiedBy: AM6PR10CA0001.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220215174307.564339-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 325d3452-69f2-4011-0868-08d9f0aaad1e X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR4S4SJ/5k7cj5ACo8dP4XlsJQbrZIrQmyE6EY03TFvlqCnTjtKBZpHjseH4eWAkFZvTTWMzxi9Y3EGSZTnhCYcGUfHSQ7WnsT5DkStnyHfZZ5bHSrJVVNjhirXFYzwgisW2Y7Yng6h4gOeIP8/IJ3Fpz5I++/6UYmYz6DK6eE5rcBdNaUym/7bSdnbhyS73NOL9k5s0aRyl/kQeGpwWau+bpc24b8Jm0EtsBbNJuraJCA0Y/bxmuH6ux0haU1SUcXB2VMaSDf6bAMftTAln9v22alUnDaId+c4hyepQXJTKmP0vVeHTU24JPAUsTrROxTEK9gVzgvFdzR8EEYpTe2wBaiXNMGCiRGNXK5t0M/n4LuTeEbkEeQvXVpB5f4+rruQ0l9UjKFCrQhTrcJx2tQ5vWLT3LoTDkk8MhIx12e/gIY5QCnpfIMm5EIIoO5zMnlQwoSb6CZRYBw/M3rwaa8RFCJvYXwrDu82X14mQYe7ewXHsN7ZPQPEANBP4iHb4rZCzveazARhY/mVPUmYalpokLzSD+mXDvbwapUhKUFpuQjqT67Fwr4snG41oZS61/EUOBgHvfVOilW26KlV+NEh57YUlOVqlEDKoE+ZamDVfoDT1yQKR3AoPf1SLYFhNKeDoMsQbEn4xb70X3ZsYw+3C/F2+Vi83cOneAm+/OKYt/wMZDd4w84Nedin/B/5ub4w0YobSMYw9uEZga1R27d6UdGvCIspGQVwNDkQ1gfMiccJch82Tpfz1kABHl8TQ/o= X-MS-TrafficTypeDiagnostic: DB6PR0301MB2533:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Cf5I14mBD/kNAFgBhynabOGfS42Jl4Ceu8CN/pXQ/Mbp5zXQ2/AyDQGsfqd/PEMPAtZSopxAXA5d2MBEG8vJ0/cpB/qAiKGmUGmRtVWMM2CbeVMzh3DL4Qp6t+jQApInGQMzUzslZlc6qnLwMhYVR0HbeO8ZmCK+iSf6EsS18pSzlXPLKFajl4ECbhoHikEFx3eK2hnOi3t+4bU9X/OgYUwh3bEwGrLA2HddB2ObFYS65yvsRs+hFHUCevbQXzJ45HeuYoTO8wl/EpSQ/xeIzQfiZ1QX2iOqEdYAZsGBRzwgymZ54HNIkMJFho3qMIX24BVTT2NI6b8mtJLXS/2Xy1z0mbKE1X/lFnRzUWGQjX+6QOc2zRm2Z7k/VHHhe8GkdbwYECLg95LYafUAEkhi7j4NuaPWIyo1KQodkZzDzjYbT5GFwpMEPsvgNds6eZiIF8lHmVNJW23sZKHWeWo3wHplommPnapH+/hjLRiW4n+uc/mgiTDMEiuvsKxUGni7g5aSHY0z4AcO5ctqzVEtxPuZsc+QR3acOjuLJdna8EyEb/Yj9Sq2e/f8wGSmVXt/Kpr9Ufm0++jHjg83oET3fA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 06wXx/uC7hwAtRw0e7NCKTs0MFMuBZNRY3DPnWmJzNlYynp/M2mb2bX2sFik2W3BMQD01QoMxfx3FFr0O66ZtQETjhY/Pekk9wuBGIPce478oWt/mScNPz11d6i2NNRFeBxHb9MRVj+wiy2Gy+ArMkLjf/ZI/ZqdurFru4UTBxaB62rCtqADhhq0ykwcUYacXq8gMm7WDonlMFFKjuETitCZ6dBJbG3cFr+/QRumhhsWU7EzRUjlSq9KsYmDLaQ+u8OPkTv226KhbsN8pbz77d+vGE+eZdk71mZUndBH8pkvMW3YDlIeUE9BdNgd76Gfk2em6FxQ7sinPisFiDNyn667021UrmHIJHCay8EA0MHfLCzQ92bRAVg+LSAuxXun0zLsvrJx8jSQCF6f3nIzVAPyyMQBy2IEnvMAIgHOvnzfPKO8G2j2YdpGDgSOzBrAf1nY/mAjnxvx0w6hyGBjAvJApZBpNrQyS8R+lCcbbF1wn54zDxvWLAnDbXxqd1jSdKADf0n+QQvyvJi/liY4DDpnlOY8MbIciAdSW38PgmV+SxrcRdhARAbZczSHH5cgg3F2LPfjIuJDs1nbg+/wwviWeJmOE04v0B7OO7DcceanyEVb3uC4IKcygEoP0/HUDcREitB+3qK03DxTWFT7+H6gtJ26TbFglr8WBqxF9BcEZeBykmcC3VqZWdEEnu+jW+GCKGV5dh+yqqENEuDfzMsUkypJJLaE3H/rTGKoVza0J94wnUEzzj2vTtYJqHWs1cgt+rx8wKmoKqvZqKaxek582uYzJ+pFEy2WL7obH7UI++F3i8U6UIVm+9zHy2QXRvyyrkhVLJXYU2WEQX0Q3TFOq1ZiOkRD7W0Sk2RKwfwO1RFK8x9OJrsRtHG3MlyRbGq6OaSQz8cEy7g8/StBuSBWaY5iz6TVb4MbXH+3hRsPtQjS7QcwmdINZG9+CBt5ykQxX9VP5+l5gr9QoRNnvQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 325d3452-69f2-4011-0868-08d9f0aaad1e X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 17:43:29.1356 (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: DB6PR0301MB2533 Subject: [FFmpeg-devel] [PATCH 07/19] avutil/log: 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: 1CBC9H+aYsJ0 It has been included since af5f434f8c0fb3b4ee3b206ebc1946ca660a8abe for deprecation reasons, but removing it has been forgotten after it had served is purpose. So remove it. For convenience, include version.h instead as LIBAVUTIL_VERSION_INT is supposed to be used when creating AVClasses. Signed-off-by: Andreas Rheinhardt --- libavcodec/ffjni.c | 1 + libavcodec/libopenh264.c | 1 + libavformat/avc.h | 1 + libavformat/data_uri.c | 1 + libavformat/ip.c | 2 ++ libavutil/cuda_check.h | 1 + libavutil/log.h | 2 +- libavutil/tests/camellia.c | 4 ++++ libavutil/tests/cast5.c | 4 ++++ libavutil/tests/twofish.c | 2 ++ libavutil/thread.h | 4 ++++ libavutil/timecode.c | 1 + libavutil/timer.h | 1 + tools/ffescape.c | 6 ++++++ 14 files changed, 30 insertions(+), 1 deletion(-) diff --git a/libavcodec/ffjni.c b/libavcodec/ffjni.c index f5b581f0f6..154be9ae99 100644 --- a/libavcodec/ffjni.c +++ b/libavcodec/ffjni.c @@ -26,6 +26,7 @@ #include "libavutil/bprint.h" #include "libavutil/log.h" +#include "libavutil/mem.h" #include "config.h" #include "jni.h" diff --git a/libavcodec/libopenh264.c b/libavcodec/libopenh264.c index 59c61a3a4c..0f6d28ed88 100644 --- a/libavcodec/libopenh264.c +++ b/libavcodec/libopenh264.c @@ -23,6 +23,7 @@ #include #include +#include "libavutil/error.h" #include "libavutil/log.h" #include "libopenh264.h" diff --git a/libavformat/avc.h b/libavformat/avc.h index aced285c7a..0ce95c194e 100644 --- a/libavformat/avc.h +++ b/libavformat/avc.h @@ -23,6 +23,7 @@ #define AVFORMAT_AVC_H #include +#include "libavutil/rational.h" #include "avio.h" typedef struct NALU { diff --git a/libavformat/data_uri.c b/libavformat/data_uri.c index 1863830abe..28eb2b9e08 100644 --- a/libavformat/data_uri.c +++ b/libavformat/data_uri.c @@ -20,6 +20,7 @@ #include #include "libavutil/avstring.h" +#include "libavutil/avutil.h" #include "libavutil/base64.h" #include "url.h" diff --git a/libavformat/ip.c b/libavformat/ip.c index 70c5529b72..b2c7ef07e5 100644 --- a/libavformat/ip.c +++ b/libavformat/ip.c @@ -18,8 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include "ip.h" #include "libavutil/avstring.h" +#include "libavutil/mem.h" static int compare_addr(const struct sockaddr_storage *a, const struct sockaddr_storage *b) diff --git a/libavutil/cuda_check.h b/libavutil/cuda_check.h index 3aea085c07..f5a9234eaf 100644 --- a/libavutil/cuda_check.h +++ b/libavutil/cuda_check.h @@ -21,6 +21,7 @@ #define AVUTIL_CUDA_CHECK_H #include "compat/cuda/dynlink_loader.h" +#include "error.h" typedef CUresult CUDAAPI cuda_check_GetErrorName(CUresult error, const char** pstr); typedef CUresult CUDAAPI cuda_check_GetErrorString(CUresult error, const char** pstr); diff --git a/libavutil/log.h b/libavutil/log.h index 99625af538..ab7ceabe22 100644 --- a/libavutil/log.h +++ b/libavutil/log.h @@ -22,8 +22,8 @@ #define AVUTIL_LOG_H #include -#include "avutil.h" #include "attributes.h" +#include "version.h" typedef enum { AV_CLASS_CATEGORY_NA = 0, diff --git a/libavutil/tests/camellia.c b/libavutil/tests/camellia.c index 1716b59a38..9fdd6cd7e8 100644 --- a/libavutil/tests/camellia.c +++ b/libavutil/tests/camellia.c @@ -19,8 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include + #include "libavutil/camellia.h" #include "libavutil/log.h" +#include "libavutil/mem.h" int main(int argc, char *argv[]) { diff --git a/libavutil/tests/cast5.c b/libavutil/tests/cast5.c index ce3aa80b5b..1ba3075e73 100644 --- a/libavutil/tests/cast5.c +++ b/libavutil/tests/cast5.c @@ -19,8 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include + #include "libavutil/cast5.h" #include "libavutil/log.h" +#include "libavutil/mem.h" int main(int argc, char** argv) { diff --git a/libavutil/tests/twofish.c b/libavutil/tests/twofish.c index 7e8b129230..a4ccbfd379 100644 --- a/libavutil/tests/twofish.c +++ b/libavutil/tests/twofish.c @@ -20,10 +20,12 @@ */ #include "libavutil/log.h" +#include "libavutil/mem.h" #include "libavutil/twofish.h" #include #include +#include int main(int argc, char *argv[]) { diff --git a/libavutil/thread.h b/libavutil/thread.h index be5c4b1340..7106fd0d47 100644 --- a/libavutil/thread.h +++ b/libavutil/thread.h @@ -31,7 +31,11 @@ #if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 1 +#include + +#include "error.h" #include "log.h" +#include "macros.h" #define ASSERT_PTHREAD_ABORT(func, ret) do { \ char errbuf[AV_ERROR_MAX_STRING_SIZE] = ""; \ diff --git a/libavutil/timecode.c b/libavutil/timecode.c index 2fc3295e25..a37d725fc7 100644 --- a/libavutil/timecode.c +++ b/libavutil/timecode.c @@ -27,6 +27,7 @@ */ #include +#include "common.h" #include "timecode.h" #include "log.h" #include "error.h" diff --git a/libavutil/timer.h b/libavutil/timer.h index 71ea2f912e..48e576739f 100644 --- a/libavutil/timer.h +++ b/libavutil/timer.h @@ -48,6 +48,7 @@ #include #endif +#include "common.h" #include "log.h" #if ARCH_AARCH64 diff --git a/tools/ffescape.c b/tools/ffescape.c index 1ed8daa801..441e2fd01b 100644 --- a/tools/ffescape.c +++ b/tools/ffescape.c @@ -19,12 +19,18 @@ */ #include "config.h" +#include +#include +#include +#include +#include #if HAVE_UNISTD_H #include /* getopt */ #endif #include "libavutil/log.h" #include "libavutil/bprint.h" +#include "libavutil/mem.h" #if !HAVE_GETOPT #include "compat/getopt.c"