From patchwork Sat Sep 2 16:21:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43492 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp255100pzb; Sat, 2 Sep 2023 09:25:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHrNEf7U2BP1M12jbptT+pKwoJbOBTi+GlCvrlugvE4sZC8yKG+mKiiLMmoOpJoHoJtWDg/ X-Received: by 2002:a17:906:5385:b0:9a2:34f:9f59 with SMTP id g5-20020a170906538500b009a2034f9f59mr3664719ejo.68.1693671902041; Sat, 02 Sep 2023 09:25:02 -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 md15-20020a170906ae8f00b0099da03ea7d7si3775524ejb.94.2023.09.02.09.25.01; Sat, 02 Sep 2023 09:25:02 -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=g1pWpojU; 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 3F9AD68C7C5; Sat, 2 Sep 2023 19:24:51 +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 804B468C7B8 for ; Sat, 2 Sep 2023 19:24:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Cla4o/zAIPjwLO7Ki8qfY+9v7PBxMHYmCIGIDvkPbhFxs3rqO6Fr11Ln/aIwpWblYdlXXWqYVv/tiU13Gd7TGgV0J21VLGLkcOSOz9W6kuvvg4HWJwsqRBD8PWZVXLq5fMpSXigdq7+GdLAUbxW5M4rcScH3xUbyViMLbze78+WQH0fSAM0/krL88gg/XofwLl3/hVJpcTbmbehN7ztpcVMh6o5c8vglV+Y2nydPvIDj1ivQ2VlHyghkGVhwzW5Q5v3eJj/ReWnywSeM53OrPl4LnncQjHAj7x6QTEfuqQku+NqnY61CxdY3dEyE/IML+mp0hc2cDodZkmdpkjV4yQ== 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=QpSXtdOGVgzzZ/cgKl7GyYTlx0MXhXhMic6586Cn+80=; b=ZMNc7ZoF3vIiBBR9v+EP2bAE8pInDcsjIou3R8C/IXun8MV1OCFJOogsX0IqUO2cSzmEu8ysLzRCQYWhqvDeYHO5P90ZiA43fwBzVhgKL7xZe+F9bglQVDQhcDoy3gDyKekn8oNeAs4093y5U2gNtP1J3sqcrYoqoigP+CVmmbaw3j5HC+ZGIuLYHzeFLPEXB0Yu2qua6xdIJniiUDgvEV2JNzdF8VjJguzD48VrCHLV+el5DJaghHA+lBy4R1PEZRLDIp/3cOwvHMJIW1BWFeSs8W8N7t+Q1ywchPQPY7duJ/afEzX6CZAyLle7/EO3o0Q3OrTeotQjBNk7D43+CQ== 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=QpSXtdOGVgzzZ/cgKl7GyYTlx0MXhXhMic6586Cn+80=; b=g1pWpojUxWZYPhKzmAFlaX/SEmCL6bxTnFidn29f+dh8kh0EclFJ3WTOMjdyxK7YwiZqlDScGewXRnQPXliupk9/ymPc88Q7CH7LnYnOd8JdOyBixb5Eg7CxYdgva+y9Yh2SYi2McAAtYCV7JQaXh/ZMYEZ821akhCmnCRJBPM8eb78UUfINAbwJrv9bhD6PrLVzQ2N4rPD14JADLTZm5O9t3iu0YmNs1gANXNlyMm5vX9eZP9tVcTPMCBF+9qIdPjMDuJf27n3ogex0G3ve2cBdByWu0LznvS39TNQZmBhrRnSu6laSpI+CT6z++wUmedaVm37iDSpWbINmyXl1xQ== 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:37 +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:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Sep 2023 18:21:39 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [qF/dKA8PikvbTBRrnXKpfQ0IwWtBK68oQ6i+UO/+VTw=] 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-4-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: 65f38c23-e6fa-4c97-24c6-08dbabd11987 X-MS-Exchange-SLBlob-MailProps: 70qbaZjg4ms4XPcuoN708l1Qu0drWhg0if4b7V15ax/fR6GoTKDTNqO7u6UfRcR+4JU18Vm0TrPl7e+bxQA+npdja0TTcbjiKVbA+shr1/Q3XncC/TojKoizqhPgYWGXDxesH/noqvpFvcwiw+35tVGLsAGqU24B/fDxGujOxsFfpaWyiQwvqfiWctGktO5Szo8dd63laT5L3lIA1CHE0+zpqp7SwG/GLSho6cSdUvynM3iAO5CG4zbeSdkkja8ACOsd3LcpsfckxaBX28+BZn97kISICM6Kq3TuRxj2EzPD/MjzJOSV5ksFxvMciBIQa4VJa1Jb9VO5l5HzTpHFQenpYJt5kf1oa98DU/kaqRDJdIBJYJdpBKV966olEw7Ti7u6Dd13MYv7Wfe/R+Mt/rcOaipBcXvKGUA39ZYeOgUADz95YgRMoh17FU0W3lfPWTQ9i4sRK9AzyF9jl2eoMFxgVPY+CO8+apoBqzEiRsaSi2TSs43dOPaVP+R0Rkfz6QkZx6mMK0NGYH/EIE23drmkG5kNIZKmqW77S3mwqusIwyJiPlSTPJie5PqbE6kXFacFqf9dJf4ZfSRQNtJu6jLnirdyY95a/jkIDbzSuoAu7p7UgR271qs78e5bCixHEHUywLL4W3XRNtOovuZgvaD41YAFSbMEdgQSg0CVyYeYzl1JqJvpDc4MNKUkfSFC4K0uklNmW5937jfGnlVNZ9YLuHiAs0ZiB97B+ppkyOO6UWMVWCWngg== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WY1rMTqg0yF4M56cmAb1WUaf9ijPc49lcTJAvs6IY6JiNp91y+hjvxqVvN6RzGAT+H8Y2q2POvJeltrBtosjws/DVUv5qhQsw13V4z35PBKh+hRE+ODO8tJHfrE3l7IjmT8TeT+5H160OU3ngC41i7b7V2zehgOo4bHd4CkJyT8c/RlMpW2JjPvCPCrYQiSs7d9r+47MFQb+I/7Km65Z1v8qwUY5hwaMMYtEMAVW+Vq+PrrdMj+7xzCNleUWeNsNlmYcxAgKwkh9paIeMOrX1sydaCzqHtSMJtrFTwOW8j5fapcMY0//zkH9ozLFmjymA38scXTRZ4P2LOT842ezWLnNJ5l+fltcbHmfnd3bumwCyxbV70WYhq2SR8snHMeWL72UT/KMKvzZLDX9UFisPP18XWQ8PQ51PXYvM/0LmXinUQoN/nXUtDjxITJ7VZ6fT4hcKrFBuTV8dbQpI4nGFRTZK7bS8XIT56UPk9167OChCwxTcq1JZl+XGK73JR3nSY4izfnwVErlGZ4vWdZ+h9dUittu79NWn1fpPX1m0Wg57lqeZpwzHtC323aybC9S41DEQD9GNt3P9Qe3H0WRyrQtvFk+1E23X4x3kJroPunT5dlKeUCmqZWbPSmKr6nY X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5oRCz6QB9qlWE9Kc/mExKrWFIm5d2QUawyLo+oS9xHP/z9Y+lAHTdkQkuoJ6pTLXLCzZhhFcVsRQdrYhUw7oXucmtBeMm+XltG0955idbzvi/Hk0obB4uvuVh6XWjq76qGGiwk3dXKKe8k0J4Xwp9WItiv/AjN9Er2Sv15+3Ee+oKK5Ak4avNZcjwGfYuzATOknteEDQNGgRTxCzzrHPoAfrmA8xAwJkoekG34b+l37PrOJZAaPiUMoi02tY+LHbwqaJ1rdHKClLz6YOwO9pRBry4/X9TRoVERKX6wSwf6zK4HoLjVl4Qs1U+iDePsjOeLxYeJnG3CLO61X9SjOWF9GRo8jwOdUyd//88UZm6kly92hQQfjn701pRnvaNfFNjIkzRuXZQ3g2IFH5i+iwYm5271h1bvGYfNH3uVZ8gzSA+RcdGp6R6vgRhNflUYg9NAeur1diW2kR2MwKmkyvsBneT0MjJZAN1O2JpJeiCAQsys87kqaSmfiUOFN4Lho/CHSrw2w3mP/Z9Ce2d62Bx7muFGCoxBrFPQjgb02b4NCsTV3Z2enkIxQ1IZ6Lj7Jvvj4avxUnXHcQGksLSxfeLSaqw6TSVSVIggM/Ht2/mBMPDpksdyMT5ytfZuE02Wdox5oXm3JxyxpHHZd/g0jXYaDI1/Ccl+Y6bh3km7FeJNYfkesyssG/+q/opl4ZpqpvOU2asvEAUwdzEMCtcju1ZLGriTl1G88qg/rp7d4Cy++pMvnQbezKEC9tDOj3iK1zSgB4jZMdStE80OO5zjJ3ehOCj5vhan47rxaNVHXzogdGuWquBDB75y0mWA3SunyQaK0gmjBdL2TbDjqu+wYEzcgwMdw+nKxVzuFnA/+Coy8V6E6OnNon3zmVHgjdFCP0YHRtwfmdaS57YIp0Y+2BFwhqFWZ79y+bLNVcEssJDAZd6uixQ0W4VRTOJHDw7wP1M//I/dPkxdFy8WftUSq3/aRfwePytEUk3Jw1yxUNxaQ9deVBD1S7PCg1kmsaR1RHrg3rT//LHvfUWD5nishB9utP5BPtwuYZ+/OCiC8R3uwCqqvKqMs8ec9/BPbe6M70rcybgO2PpHn4VLdhwjDx4HAHYmfi8PKLawcLlUOjdq/10eM5VkfNxawVIPiN0UPDODVnkU4+XNm98+4c1d5Dl9AK+IapBNuJ6jy5qEO9XS7koHjdS/2+8BkadrnkLZvsb4vk9CgQM9sI5ERhPOjSwVHxfKFj4aT9c1P+HHpLtqx2TdRIcds/YM314qeIZq9z X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 65f38c23-e6fa-4c97-24c6-08dbabd11987 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:37.0519 (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 5/7] avutil: Move error.h from avutil.h to common.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: bOEj4QGURhuH Up until now, avutil.h includes common.h which includes mem.h which includes avutil.h, so that all these headers are in fact equivalent. Yet mem.h does not need to include avutil.h at all and when it no longer does, including common.h will no longer include error.h (included by avutil.h) as well; change this by moving error.h to avutil.h, as error.h is clearly a commonly used header. Signed-off-by: Andreas Rheinhardt --- libavutil/avutil.h | 1 - libavutil/common.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 64b68bdbd3..30bec192f1 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -294,7 +294,6 @@ char av_get_picture_type_char(enum AVPictureType pict_type); */ #include "common.h" -#include "error.h" #include "rational.h" #include "version.h" #include "macros.h" diff --git a/libavutil/common.h b/libavutil/common.h index fd1404be6c..de2140a678 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -40,6 +40,7 @@ #include #include "attributes.h" +#include "error.h" #include "macros.h" //rounded division & shift