From patchwork Sat May 7 11:28:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35652 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2121818pzb; Sat, 7 May 2022 04:31:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw9ETZM2SDDhrF6QwQEzFDeAr3o1AtP8N8Q6nQ2f84v+0JGzP3XWs5QUdI//fOdHKdFaKdt X-Received: by 2002:a17:906:c113:b0:6f8:faee:2f22 with SMTP id do19-20020a170906c11300b006f8faee2f22mr375296ejc.447.1651923103495; Sat, 07 May 2022 04:31:43 -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 l8-20020a50cbc8000000b0042600959715si6340557edi.204.2022.05.07.04.31.43; Sat, 07 May 2022 04:31:43 -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=ukn6Blpc; 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 DFBF768B249; Sat, 7 May 2022 14:29:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073108.outbound.protection.outlook.com [40.92.73.108]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C6A5A68B428 for ; Sat, 7 May 2022 14:29:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ua+gjrQQ2wDbt1o3LcHovhC0ixh+SRu/x65a3YO6vguYSItMxSjAsf4Y6AZIV22mkZlfvlo6RbNOOnfb6JfhwwIIlcPonI1YImpUwbdi+T1mFer+myKMNITPf9ev9eX60B2dt8ftxPRgbH3e+EVvtcSsljqtp77omMJ9CiVC1IJVA5yXIIn/JSQ3E7OwP/UcM1NrNEvV+xGIOBd2anpMLEj5P5Ya4pSMQfWz1rCidl91EjM63bl00Cb9o3B41WZk8DtoiIBqQ/+QfotjctQGxHX9s6KNVco8b7m86EMWMLSTiVD53BK1x6Dxg/Lq2BC7sNwmGmMx/5CUADJr3dB02w== 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=ew8fieL7SOJ1Bm83lvCi9E2MGxrFWciuix/HwbManck=; b=UEb/97tjyBrrRteJwcW7fZN2lPeYRV3M6QuGuIttktVEL2ic9EhKH2WyJBda8G9d8UCQ9x8YMdgcI8IhB9aEyDBZ3y5MJMiONGEVqI2nrNO0LJ2WWaE0S1//D0wM1dDNfNA73XzhOIY5dzTDg20iSXMuvnb3a1TVfNjPKjJ9e594LKKnNHMMvEfMGHSZtj4jQqMyLb2Mj+TGscUSbAPuk5PwF+SP+E5f87XtbYhILzG4HmWh/pt0SpN6teSimuN2dRGZTkY8WpqUlTsznVMXkE8/qL0zTVine7xV/RWMQditTqMSVC2wZrcAPqgmpvU10Kgxzuwm2QJZQKqUK8s12g== 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=ew8fieL7SOJ1Bm83lvCi9E2MGxrFWciuix/HwbManck=; b=ukn6Blpcyn7NaxeR27CMo21IyUhSrDhDt4XOs8oT+DAKJ7He3NgoUyzOkcgzQyCd1Ujn6WsRHs3KPoIuF914vxYH02I16UqSfvMebkhi1nhD/2q/nvHOfJQ4AEfEpuTPn81uI3qxboH0DTmOoo/NbGF1dBGzCfAS1gRzfNZe6BzlPHOwrV4Xs36XSz2EEI+kii3qDld/y+A+UqGspuxAmOKIkmNUoWin9ZHj1IH8qcYDEf8m14SzcUtD4TEV+KwTIZYcY8mhGogAtDRqu4RtAFXiHx7r63/E1Bmk/5hdtEBGxSkaa2iAGxM7Da3rulaV1AFlHcu3fc0d/EbA6gIDmw== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by DB6PR01MB3895.eurprd01.prod.exchangelabs.com (2603:10a6:6:4b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Sat, 7 May 2022 11:29:37 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5206.024; Sat, 7 May 2022 11:29:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 May 2022 13:28:04 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [vEcyqaO9JG4IgyCGgVENp1Dr34+Q/Y2N] X-ClientProxiedBy: ZRAP278CA0004.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::14) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220507112830.406162-17-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ca43ed2e-2eca-4d75-c063-08da301cde1e X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVZjuqTokTVdg9S7+crVfX8gVcpBvxSnA/xFDzdMzvHG34qVugy3VIrV2oHE0OqxlaNO65qLAp60KW64RB/H2VG38Zk3iqq+QTFm1lP3NKz5CDbFw3obKK31N+49/LNveGuQsjbr60yPXYumNxoL7fESJFfAxvm3Qnc4LeyT6XGRrW+MWpSdhcyGsQ49LFxNd/P3PlekJLKtrP4Z8BgR2xH19qfePy8JPcvAn3B46Mbc15F1ni3blttLFTgO6+KA7b3e2hx4OlaCsb+IQIJo8GF+bE8Pu9+aDH2v96bES9FylPVq8+xfHLLvmaJhbETSgh+OsJ6AXrCvC0yl8Af1qbNHValNQ+kH9HvzqV7vS+nuIsjZMh1KpTWJ/xA8BejHlZ875SYLblCjfRRZgSQ4YHkKH6g7cOa/h+5TD+thyKgBZhvoODqvYIGmc2ulRDgsQc0fola5lnpwDsWuAYLo0K2peNKSnlUy9l3yDZ9ODVev4XTAWKk+Bx47zx0/lngbDg50twt3QjgZMIIHgSERd6w49eG0hiLNCHp37Fqp9FxquUBrwwpEaeoyaiAcqJeI/mQB0xpBwpzQ9hW+JPYw2TMxhkjalZXQx03am2iK65r6YT6m00htL3Fwy7YHzc1iAvZxaH4O27nHwnqeGGT9Pp+Kpc9iCVSpNGVG6GSIcSGzcLLnd5P/A1bQ/Vhq5TihpFQCNo7iC3wcYq1GOA/EImWHogyHC95bPs= X-MS-TrafficTypeDiagnostic: DB6PR01MB3895:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WksgnMsEgou6XMKoWahO9G+3lrvm1MBe6KPAjFG9TwcRNY0yJJbNPTkSCi9JK2uDVgt/HYTroqOAnsOv0FDZhh7YoLU74yVX6fSYVRB/ko8MTJSdPv/BjbzlmvzYYIGon34VAchtf4ugK1DrHplEwsOSjvQXy/iJZXtdjeEwow255+nShuK0UANTm/N37xlraccjuq2+k+UIvw4p1QXe0iZ6FCYMTshl8hS/1y0jgguTU1Xni9pSV2tCugFxDC+gKErQ9QVWpOz4IjLLTzEYnLVMH82WZ/6/Lus7dX4zuxBWlo+scp4OnhIYemYHx2tNIDpXTi7YCADSClLr+qdB3YNBu7XabYFbvTT3W1GlW6/r5O/gIb+Gz5+fjielHROURFbF52Zl7wwXQiY77b0I6q3x8VX8X6gweJHC8HpHAtiMlgaKCau4l0K+5vXzclSkofoLBOxFRf4mGlMRRx7bYdg8H+03fMmvJD3eu6v6k2bfd4fWWmrYTLUQXNMlt5TvlV78RPXGzGP044Hk/mos0zJHRs79aVqV9fNKoxUie7QexvnkesoIznYNSbLQU/gJ/uNwTKw0YCIubBkvfF9+Xodhd2lMENqEimzmg1PkUo0CXJMDHSRGj6g82imZPKdd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FQnLOI4HyN1i99OJbAUplQZZnZsSM1giguRnTDc1h2vwCHzyLhiQGUMlUgTgEcq/0zh69bBiP/vEu3NPvwWUcQWdGfR5rYeutTNRVQA5XWAzC5I9NIRNyytannp9v69pG5pC9T/Veo+lZPwg2DelfrzzTECMipKCN4g5leK+3dRW4XoEH83nwmjXjrz7uEu/pHO41MB4TtPm4tYf3GeQFZwIxAABUeIM8J4+gKKUw+l8Gp5LWt6jVplbLdI+VDyHYma9gh+0fdRJD389wmvUlDHVAJ/wdW9mnwCuKh+Ge5l/azG8ogtjGVJkMNXeAeGUyvg7gS+T+aTHzWcbPX9ieXU5gDPMi0ZnyB3VLzZXV0pKaQO5ioJIfXo1Ug2s4ZJSqtwmzdbv9xjDeEjM9U6l2KhhtlPZp87O3NSpRyRwIp82Oc5xFTrAy5IyTZ+wVJsn4FQa9YdhX4ss8wevFt0bE6R4CU2Qlhy3BW/Gs91n/7uUnmjGlHTtMwZu60MmboyQTxeIFwSCI/t/KqoN3nkK+66qSU8F3dv1dgplbdk7e5A8ACJ05jahsaKiS7KQnpo19rpkTS2AQKkDfHtSxJeMFBPfoHR21uhgUusUuJjpneGKKc+ucok3B/e874D+TLmzDBDF9W/8ebckTROOp0dmOAyDcm6HSXRq94zFa+oAlaNxpLBXMiyoCHphUy/2NP64m+xUlrxDEr3FFwbZ9QmPkV3z31S+WDm/3M8OvDxKsGvOXu4drNCiJv3S477RYxUlqx4IqzKDQhM6B9fq4LGrV4lAtrrMhDkxjtLowOdDznh4stlzrdURbuhc+3rwkqZ2u28xjkgH5GWkLEfSJ85xAbdUqVdyquDzJECk/b0EhEm+kvKKOiroRxB2SHV4IPzQdHqQgU8wW+8sWn7DRqryLbi2zCSNwKwtM3cVa8kr8OlYbxg7BM30zIktP/0pzev/+ZeAqpBtEMdvi+cFR+HXB9vzXEWOj9bhtLoKQkQ/ABp4uO1mfsoRFlc0A7inMRmX+4d14YrMb+Y46muLRoxyMvHUqczy5XvN8tSSEKFElEEBkx9rKOUDQ6yDazQzt9H/644fwYJHrzexA+bl2vvS7Dx7xysR/PJ1Gs7a4cMdznH9ePc3Koe8ma7wzo9QFYhfQ+LP/kx3eMOzgsL80m4pGK59kupZuqK9RxiaUyMp7WP2T9J3CWCHgMCqJSH9UJSD8yyv3QcZEm9j09qIDCXSR00MKfEa4EmmIKO7wd+Pq6kVZEA/jUVu7ZH2ZRP07+40UGUvCQrIp7JgquE0baNYPWnfBTW33a8z0+Um+kvXXjAzc8GXMqWfS7G9zU3XfLEO8eQTpWJ0WWX+zf3c54k41LlIYt2P0unksg1sAWvCzK5scqh4pSCytbI5qpudE3Be4gGjiDKzbHbyye3t5BRBjCHOvtbzC/ikZKYPrLbudcm014Pu36uaSg6TQM0dezGm X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ca43ed2e-2eca-4d75-c063-08da301cde1e X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2022 11:29:37.1996 (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: DB6PR01MB3895 Subject: [FFmpeg-devel] [PATCH 18/44] avdevice/v4l2*: 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: 39cvxXrjddId Signed-off-by: Andreas Rheinhardt --- libavdevice/v4l2-common.h | 13 +++---------- libavdevice/v4l2.c | 8 ++++++++ libavdevice/v4l2enc.c | 4 +++- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/libavdevice/v4l2-common.h b/libavdevice/v4l2-common.h index c7bed3e3b4..4fbd15d28c 100644 --- a/libavdevice/v4l2-common.h +++ b/libavdevice/v4l2-common.h @@ -21,7 +21,7 @@ #undef __STRICT_ANSI__ //workaround due to broken kernel headers #include "config.h" -#include "libavformat/internal.h" +#include #include #include #include @@ -35,15 +35,8 @@ #endif #include #endif -#include "libavutil/imgutils.h" -#include "libavutil/log.h" -#include "libavutil/opt.h" -#include "avdevice.h" -#include "timefilter.h" -#include "libavutil/parseutils.h" -#include "libavutil/pixdesc.h" -#include "libavutil/time.h" -#include "libavutil/avstring.h" +#include "libavutil/pixfmt.h" +#include "libavcodec/codec_id.h" struct fmt_map { enum AVPixelFormat ff_fmt; diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 1f009af4de..5340382d57 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -34,7 +34,15 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/imgutils.h" +#include "libavutil/parseutils.h" +#include "libavutil/pixdesc.h" +#include "libavutil/time.h" +#include "libavcodec/codec_desc.h" #include "libavformat/demux.h" +#include "libavformat/internal.h" +#include "avdevice.h" +#include "timefilter.h" #include "v4l2-common.h" #include diff --git a/libavdevice/v4l2enc.c b/libavdevice/v4l2enc.c index 787fe53547..b1006461b7 100644 --- a/libavdevice/v4l2enc.c +++ b/libavdevice/v4l2enc.c @@ -18,8 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/imgutils.h" +#include "libavutil/pixdesc.h" +#include "libavformat/avformat.h" #include "v4l2-common.h" -#include "avdevice.h" typedef struct { AVClass *class;