From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 319DD404FA for ; Mon, 24 Jan 2022 20:12:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B296868B201; Mon, 24 Jan 2022 22:10:14 +0200 (EET) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069044.outbound.protection.outlook.com [40.92.69.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E0E1B68B176 for ; Mon, 24 Jan 2022 22:10:08 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mksc2AEUDwzE0hfq0tTTECVJ+rGjAX+xN0j8H4u3iWDaZtwds4nuy+A6Tu48yNVQS2q3F2t478qHMtCxFugs83bYUl6Jk1X6oWjPuiYb6wbDed0qn0lVE2nm37wuyJWHyNdwGo6Z9hIsASZwmyyoU+306vug5wCX0JEKMdyI3f+N/4QW1NMv8PhqrBjcA3H2sivRXrBONs5KG8hxD38gBqjxqTGJnZg82ZQ0/f6Ca8z41qrBat29s01LsXo4oK3UWC5LGmH16Ks5QP6YBvymS1Iz2dl+i+DhYsZiJ/zdB3PEevSfEjguTtSKqNxhy3kxizEvxFil0jhQVd0qqRPK9Q== 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=JjZCXeGVXcxiu92Z8Yo+Hw6tgpwYkbzzlHPONtZsEw4=; b=UfFyLDBhy3HVt5zmdFxD7o8vWT+QXHSt9J3Ytfuck2IrVKic7pWXwtdg+VSv3gddjvSbf8XWFIdD4LZ64SE0ag0zTLWzAJTMW6luVOpDIMQfXxCAB5U35ymUJhz9G6TypBIG6/QB1R4PT3OzwYSWnaobd/8PudaJ7hCK3Bk4AOBxiYDp+c5mbLCL4IP9TB6mOAg4TsU2FuxlgDoerYP6iWUqRbkWTLkSbI3SKh5+4xwaXy8QdyiIYEO9TIl1NY82kzCtZaSajsPkY5iTAyHYl4TAmliguWCPUtIXuutRQPq2iyEYDyNYxKUq9DeV4QN1BcahmONbS+QnH+A//M2apA== 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=JjZCXeGVXcxiu92Z8Yo+Hw6tgpwYkbzzlHPONtZsEw4=; b=JY+zjw7gKkkFTG3delMUq/Wg0Qu1vKAOe2lIzFlRr3tJjxDx1QDguGprx/uEmfzVnNqatHpDgd1B4PUKA+nx6u+sbXU5p6XS0nzR2nYkiUUEnHxllGlTaayo5FcZRABqDqSXtqgvC+HXUMdLHaH/25vvQzxKM0U2adP5uokAcgLSWlej6UyrQ1uNJ+4cpLBOaXwlyZyCuDwnUu3DLxLKoA40fygdfhWII7NlA6hJO07IrB4CVlGZJehjHw6MqDjFoxOjKhwzBjt0tAUwKO7NuUOggY4jqbiZRnYmXR91IBVQTnYUgcyGU8BZBJzkArTO8HcT202CnlPvzWSpXO4I9g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DBBPR03MB5368.eurprd03.prod.outlook.com (2603:10a6:10:d6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.17; Mon, 24 Jan 2022 20:10:07 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%4]) with mapi id 15.20.4909.017; Mon, 24 Jan 2022 20:10:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:28 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> References: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> X-TMN: [bogDiONOgvUla78OrKpZ//JiGD6YPAci] X-ClientProxiedBy: AS8PR04CA0012.eurprd04.prod.outlook.com (2603:10a6:20b:310::17) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220124200931.593079-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3cbf06cf-7c1a-49cb-8906-08d9df75844f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRuJzjo+afAgK4jr0IBXHTxWBPBQgtKVzSBVW373QzBffkQ5phl4KMqLDemHVD+RKyGymuTFj1d3tJbNN8BFt5kuGPBahdtmqIZmA84SoN9yf3fu1+vUUFl0xV3MnMvqCNNO7MW3rQaCFaY+8QvG8ZDkAlUZL+XOD2y+hT91qXHXIkbhqZ7oqbK+T8v54qrqY0Ih64t9G0s06pBuiU4oCh7kOKgMxQAoABHYI3SZM16fo1JG1xqoyswFXDkFKw4D3vLjPGTiwVTMd5aDf23Wn9qgGPMcfzXpHnUvjTStbxcJkQOu7jvGBzVlBcnzmCFQ45dWJJB/vYmAvpDotgwDidQEt8KT+iaj3GZU9WCw0Ozl9WuxqwB1iTpnScsSEU7dDNGr4uT1lI5O9AHTc1KJqdEApUcj4h4GhEGw7ovPFbJMgXNl3XrWNYeNlXFXVMCEe6vWKGlQdaa/8wceEMZaIc8OdFJCrk3RbfF7zBDMZ+zizXIiaEIKQa4ocKfMQQUw+A7MLKMhiGct/MF3LHZi/aOVBxZSqwY0x1OzRpkbLFrgl1nD/32gypdV4RtAJPpDhJbLXQbF0rhrxKCe55iuYw13o6UkvPBtV18ptxLAPvVRMgB4rCT3iCDjcmwY2yRP7iASzH7S7oszQo7m7c9108qXWfXICV2mFnzC5k0wBnjjul4J7XYIV/vupLfgiE50FxFNISOtEhAFZk2dBbn1v339eDn3u+b5667kHmtdk/MW8W3vRX4P6F6/WsUdstHPzA= X-MS-TrafficTypeDiagnostic: DBBPR03MB5368:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8ZSepZBhaf3mM/FAfBa6Oiilndzs5vuYkPCcFJ/n0IIchl4Rg5W6F/bKC1Y0S/6lZuCrCeoDnfOR38T4mV1ooRoG1/dg6yCB5BbA7fSKrjR2JdCQzjODjuOn6O7QiRaXxksPYDYFx6INMF1X0bJJeF9HP9o7HL4AlYA0tVWKdjwiBCTxo7wVcI69fK8/caMbvjYU9yY3+KuITHBg6AQGx1IG11GHP0wxw/JS1uGZQYREEZWZEoumsmuUiDNZN4aBefZqE3p22xVNTbD+l2y/75XwkTNOXxbCD7JbzZvz/Rx/eZhmU9XRf8+coUfbRNEsnKazpcQ17hNAUGMuS/yOYFrEQt4Y1p+ZG4Ygu7w4lAGNFAqetId4eHfGqcSk9VJ3tgJMlnH/PWspNykKnTgR3pXEq4KcviRkaEei2YxQrYPpmKzK9a8vCE+FZ8tjDttRvehdKHp6E8fSW/kJAeg1IyDrdPZ/kCmk1OtxB/9YthZhWF+RRjQh8sNMrRKFSMF5C5MJvZVyrlKSXGSpmCuDGKTLAFistiWfzVtfMrzXxTgpTEubU95nEr35gqs6f8aV90otzN2kGiDe/wLOmTCRGg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Ums+c/BkZWXW0/h45//6Qidn0fssEJjAHUgN6dLt+5ZohdIr8c2a8HUEm1yR?= =?us-ascii?Q?JTnX/L2RLE6oQKEP10cA1ZC+Tjx/VHwLetIUyEaCdIyNPrVPpwoOfbSL678D?= =?us-ascii?Q?aGZehjZiJH6IdJVItmb2tl5B5vT5Us+EPfCi3HX8bqKYExaaVrdRbtzpOEME?= =?us-ascii?Q?BZEMUrf8eABNcsjQ0cMZo5mRvtPrfYtRd4GAs65pSnCkAKY4bLgQjcHTFkyN?= =?us-ascii?Q?Pmc6+ZD5mB246GNKl3+4BtXfPymAcJvkx3x7ol/7bIrE3etkvtmI2EKrsKuI?= =?us-ascii?Q?TZWaggEN3UusgxrNlkSjf5P2BGW+VpFDpt6odHOrZMXTqh0g96KVvLQlrRYZ?= =?us-ascii?Q?3t+NwHxW+d18su7TsCzYE9YscZWyqxVKKPPvK8sYf1QOzoGG3pKB/JkZTwLh?= =?us-ascii?Q?x5IOY6TAwoJ1iHT0jcjwP3iFVbB0oYvfx2MlhSqweBCBmWchXK0vKusy9XQl?= =?us-ascii?Q?Qy6BUPDV7EtTMluVLbx6Fwvcm4JzebcsRIdwchNv1vk1MAJtoWZ1eMyHt1e/?= =?us-ascii?Q?sRoajqegzCeF7Wxp6xLVixb5SlUQ+p/rKIemcYqqlBclQtrgj9BmeSvOS+xJ?= =?us-ascii?Q?9DakWrqKHd/wWLjwXzusrbnocON5tsHDbA+tLV+Ddz7+od9Zl42kDa97+fDq?= =?us-ascii?Q?ifjYr4IlJEmEHN2fd+0PJ60jBEnfktm/NmOUpKUkyc3YwRFyiET7B8Ba2r3O?= =?us-ascii?Q?DGSWufazgmGOI9mU7M7h5T2Pl75YoHOZZo4yWFm7pNlLJMQNTBtPbMU/99rH?= =?us-ascii?Q?dAwzG3iu/daTg6wD4fD1pj3nRy+DY636AkrBXdVqAB6VVA3I3fIFaFKv2A7A?= =?us-ascii?Q?Q6OIvKNyGOkJYMMr3GcLKUagvNIR5UjWbzQFrE/y7B7eooYOShixLE2l16xZ?= =?us-ascii?Q?6SFb2PI0n/IXuylWacB7R5xuvHknYWuENU9upxzbmvjN48D2n9MxBFbA1ePN?= =?us-ascii?Q?G9P53WD+RoXYwYH1zeK/bw=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3cbf06cf-7c1a-49cb-8906-08d9df75844f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2022 20:10:07.5495 (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: DBBPR03MB5368 Subject: [FFmpeg-devel] [PATCH v2 15/18] avcodec/h264*: Remove unnecessary h264_mvpred.h inclusions 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This is only needed by h264_cabac.c and h264_cavlc.c. Also fix up the other headers while at it. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_picture.c | 9 --------- libavcodec/h264_slice.c | 3 +-- libavcodec/h264dec.c | 9 --------- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index adf8a32378..dcd5874c2e 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -26,19 +26,10 @@ */ #include "libavutil/avassert.h" -#include "libavutil/imgutils.h" -#include "internal.h" -#include "cabac.h" -#include "cabac_functions.h" #include "error_resilience.h" #include "avcodec.h" #include "h264dec.h" -#include "h264data.h" -#include "h264chroma.h" -#include "h264_mvpred.h" -#include "mathops.h" #include "mpegutils.h" -#include "rectangle.h" #include "thread.h" void ff_h264_unref_picture(H264Context *h, H264Picture *pic) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 32df9fd3ae..dc636c5e78 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -27,8 +27,8 @@ #include "libavutil/avassert.h" #include "libavutil/display.h" -#include "libavutil/imgutils.h" #include "libavutil/film_grain_params.h" +#include "libavutil/pixdesc.h" #include "libavutil/stereo3d.h" #include "libavutil/timecode.h" #include "internal.h" @@ -40,7 +40,6 @@ #include "h264dec.h" #include "h264data.h" #include "h264chroma.h" -#include "h264_mvpred.h" #include "h264_ps.h" #include "golomb.h" #include "mathops.h" diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 3706ae0e31..ed9a74b0c6 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -28,29 +28,20 @@ #define UNCHECKED_BITSTREAM_READER 1 #include "libavutil/avassert.h" -#include "libavutil/display.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" -#include "libavutil/stereo3d.h" #include "libavutil/video_enc_params.h" #include "internal.h" -#include "bytestream.h" -#include "cabac.h" -#include "cabac_functions.h" #include "error_resilience.h" #include "avcodec.h" #include "h264.h" #include "h264dec.h" #include "h2645_parse.h" #include "h264data.h" -#include "h264chroma.h" -#include "h264_mvpred.h" #include "h264_ps.h" #include "golomb.h" #include "hwconfig.h" -#include "mathops.h" -#include "me_cmp.h" #include "mpegutils.h" #include "profiles.h" #include "rectangle.h" -- 2.32.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".