From patchwork Sat Feb 3 13:38:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 45993 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a28:b0:199:de12:6fa6 with SMTP id cj40csp1559895pzb; Sat, 3 Feb 2024 05:52:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IF0EY57mD3LtiJzrqDTvBGwPetDNDgpOTwhf1ciU9kXMkHG9BgjIFMQyWhAPEmY+hsFD0qj X-Received: by 2002:a05:6402:b44:b0:560:2123:ab4a with SMTP id bx4-20020a0564020b4400b005602123ab4amr1234762edb.10.1706968340481; Sat, 03 Feb 2024 05:52:20 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXlfGlxlSbEsE7ic9EEveuEeHJuxmozFt2iBHARprOhKAd6yOJ7cR7lQ+Egvi1+HbKFnOaWmF3qXKii00r5tyCjgvZ6GVLjHqZ3kIV77owmsvCv0N0qlfFNRj81NnjFZKK9v/LbAF2v149B0/fA61JlZohr4lWLuAFjvzjdegQqPP2AIAJb3DK24YCKWq5d0O5b05cFgIGVNml/5S7Usyvd/QuShkvHrihcUT4zuvBe5XKJ0g8JJ5zWVmAcbXPUwkrYxwP6p8nmt0+5gXQ/nSim1J+CwUv08bzzjZ6bjCk6m6nksRogRSKExMFh5tiq7V9opKhw8QQGoY47iUSJsSXF5gSvM5mAyIwumK2D9htEeAw0OaTOmJa5cX7MOZsYhLbQgRPkPAmI+KDrEXOzfWJbDwC6uH4/RHK/yAb9LTnECd3ZNdGEVr+Bd2r3R+g0jswKPjtTT/n15CFHTtyBwEpofzXSc+oirbk6ZRQHAArGeBQP3gHJqtJH1HeObhIOqU9/9SahlIVifTofq8Ke9NFhtU9N8FnJPAf20Wzdwd12xhRayOTudYbi8Ax5BbrMIatmbnRTnJHFDEz4CsAqFYNmmoQ1PIy9KjTuTh/GNAeHOLHklp5GptAnMCxlhu/fP+JjUR7wYC8px/ALu/ZOk7bvoAn9ZhG1UBSYwsUAePPZkSdRQswF/bQo4+VkmW0oh7jhEnQwAMXGy1Mz2+clObzLcgmc6ffgWfyrOSnlafI+mc+zHXSAUzMvh/f9qbtZMqDePXwG8dqM1GL9IL36jk5Mzo6hSKt1e1E7ca6rnFlm1IxtmSfIMcIVgaFw+rpIChKGlYcE07wlpG4nmeWqojygxeNCCwqitNQK5Biqn1OSL4nsCrFneAGclt3+y9NSAtI//+DsSrj8mKSOLt+ZYYQ07C35Uif1Q3Th9RuqlW6Yjft8pvmwyK6surSh+ywIJQi3t8 /QaJKwXInQlMwN5gHK5XToFNYwqv9zrTs5x9sp+5H1HPwOsEdkbZLoHO72F+vsqgdAg5Y31QlYF5hWP5iEeOpQYQxUeMRY/y69wuZ5M1dNzeYrwnb1LKd5bgY10uQbY8mjmuJSNEiRekhUL4cjCsGVTu5RL/Xn8gTQIn55zWzAC/gw6nMDIx8S6eygM+F+lAs1E0xdl9LWHFGsP0BF03b5CMoEPR/S8jUwe4pLeGtZ0OFRkj8v8VOXVnjv0Y0+ClpX7ACIjWA/qDW9RHNn177E8Nd4BX0M1irf8LjjQdVniKdDcPQaD+Ff9xKyFRkV0x8qLnlVCnZLxGyBM8160qbNbhQVIHUt4CiXOb7TwsG2Nqb13EPwHKkW4PLHBBLIvmpM6QunY5E7AvJHqZ2UX/WaUcw/SEd1D472Th1a0iLEVmSiEvLSAeEKLrzmN3SrEugUlyK2wTwmD7j8yJjUr9dOkD+OUNDvqk2ZlmOzx9zWORi/msGBukLNfs5egZDXN1K2m0I+XqLTa8TtksgqQcz4EL1nWALLMcHUYdT14uta4OBOggXBTuo5335CbTV7Kwfyw4kIY7yTrIN/m8RUMdcJHmQIZ9nEEklH0QJ0upS+qb2CAeDJAVD+f0KlUjLxZon89wAfcxuusok= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d34-20020a056402402200b0055eeb0eadbesi1967529eda.640.2024.02.03.05.52.20; Sat, 03 Feb 2024 05:52:20 -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=MuUuCcJo; 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 DC23E68D12E; Sat, 3 Feb 2024 15:52:15 +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-am6eur05olkn2020.outbound.protection.outlook.com [40.92.91.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F92668D109 for ; Sat, 3 Feb 2024 15:52:09 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j5xZYTh3wXGFEg/itVVQswVD/9HxVe6AJlGruwz8xAAplfbAYqWh84mcjSE0Of4K0CumcWT/QOIGp/sVHItuFEj1tuwaeG/ofTN0kQGPOYqESa+HETxjhwB1G9hmJDy2m4YEFeshuf9J0UqoAVvt/Sa60m/MtNzlRfilhunLx/R9T1RkAH9STNmfIuNWoOn0tNiVlX9XHwtefYoYLmuMsQAZpChSSbfsuSV1kJ/qfOeKiW6VgxEJTbMb8MXA1R4GziQBIftk+5i4NVGn1aoP/zlcXddgyhuePDWVtxjFNAVe+OyWfVLgjkdBpEh5op/qqfy4LaNfjPbC3ejzilsbuA== 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=88g/huN5/D2bDbUTXIJa/+Xc3b9hFkdLRnYGLI5DO4Y=; b=UJPsdL+mIH0Az0Frv3Nve+jl3Vw3hLZDXwr4jUNXZvoN8Kg4Z55nP6EfJRFKNvwjpBWlRaSB8+5jUS5CP8eKjfa5W5uJJgk+7BGuG2YjDBKwJqrLvOlL4UyRd3wVxu8Tdpi5S0/NWjINYcchmCXnxUsB3XAY7Sr/9WG838aYQ3gzzyDaE8FEDjrilZ+6rsCB5uMrnJikenqxe39oa7ZNw5ly+xk4b7AC74xz8rkf4Z3gxedTMXbYrWKfmcawfSiHnXH15UbCyCM+PLOuY0oM8MoTnOkroSQmECn/dMn6KGIPkm4d9TlXHfpIsdgHYB9HXXs14s+eWifvq9XI4dAYTg== 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=88g/huN5/D2bDbUTXIJa/+Xc3b9hFkdLRnYGLI5DO4Y=; b=MuUuCcJo/SNyTilBPBeEGA9pcb4wIK5eQ8C6aDGXFhYaYD04CWCJ5/BjkG8Udc3vhE2aGgxY5I5JtCjzKMMY12BVBS854YtK5KpI8nGOKm4lYz7SJMVE5CaERXrB5k2tPuGqInar8wmDCgu6lUoAWpUakuuobWx9VOAZCTOFiE16pjgyEtzAKW9ilJj5U07qWFD0pLNyNsKZhU6HC0FNXHOnHWzhI6jHmPAKBicvcmsx4u30DHozpDqPRZ3dxqyda+RXyoqO0To48VvlV2Mbbt+6H0GuKf8cYxGSU5qijp+iAVM4bfy2PAXxmhKinjGPuit9J6TvpmkK0bdKtlZkQw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0227.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17a::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.31; Sat, 3 Feb 2024 13:36:24 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7202.031; Sat, 3 Feb 2024 13:36:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Feb 2024 14:38:11 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [CSeXCJ3xtxBfn8BFCn56MiDOXU08KI04mBoEsXqI5tw=] X-ClientProxiedBy: ZR0P278CA0154.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::9) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240203133811.1977576-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0227:EE_ X-MS-Office365-Filtering-Correlation-Id: 5dbf36f6-7684-489b-ba1e-08dc24bd1d5a X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqPKEShJC3QrrYeKqT0kXTmdu8sqAR0JLdrww/RvNllO36v/RLKGUncrBn9B1wdC3ou7H1AnfKGfnyKkYNNjBF1Jri+u5kgo5TnFJYCmB9abg7IT/9H+AZjMNenjKZaUkcSxEdzCnB9YkaLKysgrM+qjAVBecmfIAfTqsUozfpsSUIb2b1D1iHGeZRgDDGRbX26PdmO2Fp4cFYIqwc669JkIsRTMsIjrMiU3S/x0j4k0gEu8C/olFlTNd0EuI5mrwJfmlIZOK3Bi/HHkdDNyGYYPSwZbNpLPH6f8SiBdXBqiVVi0+fcUAB17PvxhV17o7ZDWP9JdW1EqaQE6T45zt0rLX1HTW1ckfbAp6O0lyZJwuJgBLM0uK8Z//2azB1+3YzadGhllCDstrFsZqt9Myd6MLwI+T0P1BpXEWdoS+7TsvzGL6KJYIPGNW6k+BNnqW4OpTIlvbCGYBU1cq7uYowXI+2ztpsiFzBMOmlB1Qx6jz5SkTM6Z2uPrS5icx9QPnb3UlzvEZXzLiOVMJI3GO11tGCZL6aAn09yJrZRgShlDFYokYStKcdxFCz1ZNuo7XTbYrOg5ztrKtzUa0gTUPIjUKEC8MNnOYxa6lu/hQl9PgXYS3eL/svdWWLsRQ9JeEmr0yFCiL+iv65QQiZt/Fz/dFNhhS9Mgangr6AqsviIVhuXNBazhGPCVEDfoxnW1NOmI8I2MvmPdlGPq1O2X7Vffqvt408z3miAckXvEhsg5bWUVepQoy33q8p2CewmS3M= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mwVn0KpMWb1WdJ0mr9Mx9udADZh9ZXP1ZsihcAiTzI61Hnc3ATGeHU98hI9UHQ2UHcHvKMtYxYIK5+k0f7vFJ6O22U7W1Iy+5hwqxOJexo7/azH/cP2l1XDeNmJk+sTVv9TQP6u1Hdw/Wm59matThamIGsnJo7eVMhM8F9WcrFyLP8j4M45n7y9vXGPH4qaG1m7+yjHPJrZcieBvngOyVDJIRcP8s+72aOi7ZpOj2b74n7t7fOhuEPKmphi4Xh2fgGNoOxOnnigVIrjgGA2DC+PvWpjX3MbEhYmQHY5c18NeZrNxoUxZVZNFXac1C46rjyYQxdDMwNhdPSuEC0EoRsBLZy7784unrUXN6P2/twugN/qC/YYand0t1i3ZXRQELHCMj2NSPfiO1JtCcwU6zLaIi6xcekjvP7S1SvNwoYDbahASxaUs/79ep2glQ/zC+VShEvwESFVg4SsXDILqKQoWirnFxWyUu6bnKDSbPu8QmHJzQO6UlvEmdOYbyCCyP4SkU7X/g5eksBPCV4LbBeehLt52itLReuCm4CfPL66fgiWtkeJBXPr2zXQlZ8xL//7KtkK7hFZLmBcm6bhTqHgCaE43KWVxoDEUXod2BgnhtXaj9s5GBmvgfXrXvKl/ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7o6kdfDTewWceMla8V3ciBMrWrUA9L3nK8JDGmot83fsX355JF1oYWqiJS/45i1iQrBZywus1kIEy65S0Isy2uto2cUr9jtGHxH4VP/iGhh4lJHSXQE1t6VBb2XahgdwzQMqmtbyCv9mhlw8dCVlO5n8Ykpc6i2OuTR2+0RLd5mk4IBarBbKekRYvKdHr8Ql9JW4nk4zYtpdmh4y4JTxDcBOedTfJ5BTvkxRnWW/LaZWDPZvZvuHNvQY11cpj4jpHRlILsLUfAsogh4yDFdo4y31mJW/UlQKn5+ct3QRdkUgzIT1RWJkow+8UMeIlfvpinSZ5Q5tHydhkLxfSg2rv39yX9DnaOeRVM82ZOdGjo5vxPx9NEbPtPj+eLukSVUjRSzEyuOLkJHGlsC4S2KQLIsA6pvlsvzg8sp/P9vCQiV/2aHDeSPpiPYbNv1dxd7Is+nJdz52aPeCOBDyeh+0QjF8Jmy5+awS0g4+Xa2jrbN3oS7ubyYiE+RGmB9sbtHJBeovoyF52x4KXYcPtA0OQxDUhpzm6pGPefSb+/UV7BScrL/D8SdHcm1P9ITKBbJjnSpDp/rW/uACu8aOQMJ6pp6Pp/g0K/X5z72hYtos95xzGCBeVy3snHWNX25c/5TV68ZyzNjBzET6vt5VKC1u7wKUkFNc7RBz+JxQvaJBW1y+LsprnyTBPNRxXnaCOfCNxPePTJ+Q/AnuNlV3716NTZZnzNWeR+kZsBij2GDatpesGyeAe+VtXt37jQOyWjGRurXohuW5I0YQ5BBxvSj2vMRlPNYearRaqEGlyCdQa73oAg1mxU3mfuybyuan/7Ka65I1Qrs4x8NdyDrorvQMZRP3hyzQtsMpnzqGJpRqpVfhtU27Vganli62s7WgHc8uKV12DRy42NQtDU+gT0nPBThnQZIeL8SUMPTTboco3yap9RWWBfQGJ3/JDiqTnedbkfRNroJFmZBL6I0RwpTG/B/gyeaCMYNcjkYosagL+2Gra6gGp4GYy9GAdukxnbrXGKL2xK0X3IilhfQBCoS+blDPwOV5mEW9pmDXTS7ULHRWYFzY40NzYl5AWL1/J13yql3ugl6vW0/lTRNk8GaYAh4t7NE4uOsNlOAIyOmZ4XkDKYUYgY1NAEGfqSijmEfWXDo1OtF06D+lvfuTyyp7zGw7V0cMCvYGoluYGTRBL98+yaIM0bGjrYS3Co57hxzHLtrSXLwxKY7k0rgz3i11/cAjGzmrq53ElS1skGvPcxER61s22PWLMZu37CwL3VUn X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5dbf36f6-7684-489b-ba1e-08dc24bd1d5a X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Feb 2024 13:36:24.2044 (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: PR3P250MB0227 Subject: [FFmpeg-devel] [PATCH 2/2] avfilter/ccfifo: Improve included headers 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: YCphjaVZCNqN We don't need to include fifo.h, because we don't need AVFifo as a complete type. Also add the other used headers directly. Signed-off-by: Andreas Rheinhardt --- libavfilter/ccfifo.c | 1 + libavfilter/ccfifo.h | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libavfilter/ccfifo.c b/libavfilter/ccfifo.c index 29108822be..d76dbff149 100644 --- a/libavfilter/ccfifo.c +++ b/libavfilter/ccfifo.c @@ -22,6 +22,7 @@ */ #include "ccfifo.h" +#include "libavutil/fifo.h" #define MAX_CC_ELEMENTS 128 diff --git a/libavfilter/ccfifo.h b/libavfilter/ccfifo.h index 565a837a00..d3f8a52cc1 100644 --- a/libavfilter/ccfifo.h +++ b/libavfilter/ccfifo.h @@ -29,15 +29,17 @@ #ifndef AVFILTER_CCFIFO_H #define AVFILTER_CCFIFO_H -#include "libavutil/avutil.h" +#include +#include + #include "libavutil/frame.h" -#include "libavutil/fifo.h" +#include "libavutil/rational.h" #define CC_BYTES_PER_ENTRY 3 typedef struct CCFifo { - AVFifo *cc_608_fifo; - AVFifo *cc_708_fifo; + struct AVFifo *cc_608_fifo; + struct AVFifo *cc_708_fifo; AVRational framerate; int expected_cc_count; int expected_608;