From patchwork Wed Mar 27 01:38:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47515 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp322002pzb; Tue, 26 Mar 2024 18:39:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW/VtLcZOaYB4/Vogt3Yn2CgBWTevN0xN0wo32YhMla6b6w/zsfZsIEV6T0IcIFSqvEY4MeDufzjzZfou2sCNtIKBaA6NNrLZ0W4A== X-Google-Smtp-Source: AGHT+IE5m2MJdYbx3NW9y4xomWdaQ3rgGDuIenr2NKlrFQanS2/lYjUHsrPHkjaeunU9Ao53luyu X-Received: by 2002:a50:bb0c:0:b0:56b:7f64:86f7 with SMTP id y12-20020a50bb0c000000b0056b7f6486f7mr7286151ede.3.1711503545114; Tue, 26 Mar 2024 18:39:05 -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 eo13-20020a056402530d00b0056bf2f4438bsi4094037edb.307.2024.03.26.18.39.04; Tue, 26 Mar 2024 18:39:05 -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=kUbj97nV; 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 C2AB868D6D5; Wed, 27 Mar 2024 03:38:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2075.outbound.protection.outlook.com [40.92.73.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95A1668D6C4 for ; Wed, 27 Mar 2024 03:38:44 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aHDCtyzs5RBHaX9xWPzB7S1aRPup6FCSz4VOSu1iSDAzGN9CROSenjnnZ3GHJj1aXBQ7DGW6mYf1vBRxfMnYkwbKLzwa4Xc8Dq3nxYuZOn5iJZWb4mNfUN3AK3o2RrrW4ebAhlNX2z3Tm9hg84O99nHDZNvFxtMe9D7gBUMPVJEi3/fDEuoO7LrZwTItzoJ6loAt+vQ1ZPUxhYVoxCUgKp4EmGaQlOTzCNEAEClyp6SabYlxYC8ygpAqv85bjFhxwPID35dtkjGLXHnv4tcUMvNW4AnijzYqCT7+pYOlrwe0I1yVa3g41Y3O+wZYTcLrWnwWVhVWaCLEctHwpssntg== 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=XY5cF/kXxoxSQHmABZ09hdUhRBpf+0g63CcKqVNhT6w=; b=Y74tmbtblfOLdOUfEkMH7l9Bv6HUlkG7QO6Tr3xgmNXlE+JqRP7sX0Z4MLmQQRsz7b33UieDk2GgbjD4G+rfYTDeQbJbfw3HLhPnBypcx8n7zlsrJ3umi3OPhF2d6zzXonM5bDLvmXUDKPnWoLrJetTCZDmKD8v2amwdQpmRt+ZgeLiSJ+8VoNWPh9xWsHFQqtqlJ4EnmdB+t4k4+IbDT0ZKfwuxBWlA16vV+J0gnbIxATE65Ex1sa9IgM9TUDKlJvPUS5tsMRRSOcBDV1uTCfoj559qqA77ssj9+OdvwyrSorjsRd0T9GjeytVkF+0X3hFmsIyKpSshsrVgiK2r8g== 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=XY5cF/kXxoxSQHmABZ09hdUhRBpf+0g63CcKqVNhT6w=; b=kUbj97nVDk6mjJ25qV/11noqtcXNQ7LU4e2fhWGih2JECTbzL0YbIOpH6Zg8zXksf+1jW1RgN8L6e3hkU0r/G4D8pCs+mWlpx9/t8TS4OMbTPpLr04lIdRsQnmSnUsGwAxI5/ILqxwg7DHxI8Q1NNWlKx3Y5eXvJZebviySg9iSv4Ixg0jyqhovw+lZ9FKm4+jw2WFYRF6SG2sccelH5s2x9F5ttKt+yAARU78ByU1+A+JYvcwe3BFnDKjzpzB9L5Ylo16aBODe8Y7gdmesalIKgAVH3vTX8tew/hOz090EatQGPiFMKyuGM3VhSNaI+xXdXpYh1AwFLPdcHJxqGFA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0344.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32b::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.31; Wed, 27 Mar 2024 01:38:31 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.028; Wed, 27 Mar 2024 01:38:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Mar 2024 02:38:18 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [krT4ExfLICXR6/b9eS4YFpxI/EcyBIgDLP9osPMWjAo=] X-ClientProxiedBy: ZR0P278CA0075.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240327013819.265196-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0344:EE_ X-MS-Office365-Filtering-Correlation-Id: 49c7bcd2-e22e-4bce-9422-08dc4dfe9c19 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ptzmzdqLDvI2EnnzmesRLbtXhfj+CJbMGTb2j4+mZvjWu27uXournBA3SI6I57ORjNRI9qu8e08YW43o5lZasgnwAOrvYUxztC5RV3DmXXMtxQYkPvBCNjYALXkCWElqcqU2EO14jTEITKpwrc+9xNUe7pul5jQHNlATL4Hzm4qHwPhy66jLOCusJojjVAYxWhxQUEndIfesv+w0OUNHD339ojVjLNAnENIKEbP6TVfCfH7sJm/vH7UW1WJ8rOgaC4kcJG59FIZFawonArjGLeiTKexhY2R5TqTPylMnw/va0HUNHmNXU/wPUP47n8JwoAQSk9yRoDphl9R+m05DFG2pFo1xlk8O5JQRl03GxGmZjpCjO7dYQG9HBS7q864FybSJ0ZpqYSxGkw5tuVmHTMr1pP5eUajKOjSgS0tpCm7DrOjd1MruLk7+fn43fExNJFGDoxMjOBzyeDMqlN4Sa5vt5sC3gRBFKNZ4E7zohj00bBYH6GUf6U3Gwj4exedKkLIuhCrLYe74Ixgh917Ml+3MvgPQIpGQ9NyKaWE6A8gLuDb/DkMYo5K3El66ohlzZ5nz/QKwceWzQzHekr7TdxUc4EUi8o6Kbu4djta8LF753OWfQJQ98hTzX4zSdvMs X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4is4Yz63PEYefVqqc35JX7RBcuSPvo2K2DGx7WQ+9TNmH+GZXt9eJu6h0gIcyZ7aHOhjAvxcsMSX4OtAnUlIxmS+NKqw+BMVrdsfQQeS4eWk+l/o6uXotbasxoMjAsHnCWfyjXJBgPPgvWzrTK7l3yKpY03jnWfVk/RVLn+C6ZzICsmifA2IfCvjG0N9zDE5fBlZizjhx7fnKi7IIZFmHm9yqJgHv5+bqixjv48iyM++T6VRsswAVNNPFeWWYjVjxAhvREfVPBLQPLjwJio0nfw1qLGkTPcnXTxVHfjJbhCkwyxh1iF0JJmp7tninQ/Vr1DeWN4FFqi1Xnc6GEqYttcTGnC/btrKbqtycj7S4BcVFNtJfdQ+xQAjqFm/ivjmnr3PREFxgA2cqdmfypN+SnUDbm+cBYp9oRgZfUX/4NnRxacXnro5qL/8WSnjJY7SpLXnFHwUROoV0fmA/iFk7b4w8i0ntz9CNTlSYmcVUPde617jD0CSxyriRyjpAS1cULo2w3XSTOl78ykIPJywqu3cUwg0zvu+xNU32/PZxYr7FVuSXMvXM/fr2vOFAZIMkTHnKC8dN30AkZ6yQpGGn7JmN9Hd9qSEf1sUcmu/kSFZrw3BoHPrFOFAXnR+LC/RtulMsQGClAVoe1R5uuC8/0FR+iybfNW7hbPIcNMIUZUMMLYwhwf7Cb+6O5detzfKDzd0Ln4KGzD+3dHguAToTwcdrUuEmMVrIsm8dOOrhv62SLUOZny1Nee2Ub40Tq6NC4ALWx7P2J5QwCztCTpRJD78Jwsphm8HME/h+su6xSSVAAB5fjsDzuxu2DvK775SHYuqyTKAzl4m+01y5u41zeRHAKHzXVV5A+HDifRz8VIvaHI0Gy2iw3vjQ1GIYR5kl1MM48i/sh/VzEvZEo6+vCF6ooQr4Nl7+gPAOYSQ/FEx9abYU/r0PhpaOqJ/adISOOPVR2nESgLcSeDnpgE+UWxp24qJo376m/0Y3E+kyGX/L5HFGL8VS8np00ms31j7QsCQURjsAxOg0gu4+S/K9J/1Kdkel81SKwccOxnvu/22cSfPYCoGPvpS3tN06vg5WCqLhMSH7//W8pL5FHUsUYI+n2DfaKfCJn7IO4sMcg96pzptHNUgrk4zBgCqvQt9ZVUbtYkheI8C7tYlEdzxW4s3EMkrm394q8H6dr8Iz0984atyg9TMrH09LkIzfqbv2ZTvjEg3b1q0bCVHSgFybA/LF6WFt+DUXe1D4BknZJ+jJKF5DHhrNAUw44Llg0s1bSIZbw55iz6Cb+1cE6gzEQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 49c7bcd2-e22e-4bce-9422-08dc4dfe9c19 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2024 01:38:31.7699 (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: AM8P250MB0344 Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/ratecontrol: Use forward declaration for AVExpr 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: 2F1hoegsAR6K Avoids including eval.h everywhere where mpegvideo.h is included. Signed-off-by: Andreas Rheinhardt --- libavcodec/ratecontrol.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/ratecontrol.h b/libavcodec/ratecontrol.h index 4de80fad90..1f44b44341 100644 --- a/libavcodec/ratecontrol.h +++ b/libavcodec/ratecontrol.h @@ -28,9 +28,7 @@ * ratecontrol header. */ -#include #include -#include "libavutil/eval.h" typedef struct Predictor{ double coeff; @@ -80,7 +78,7 @@ typedef struct RateControlContext{ int frame_count[5]; int last_non_b_pict_type; - AVExpr * rc_eq_eval; + struct AVExpr *rc_eq_eval; }RateControlContext; struct MpegEncContext;