From patchwork Wed Aug 2 06:43:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43073 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c11f:b0:130:ccc6:6c4b with SMTP id bh31csp455447pzb; Tue, 1 Aug 2023 23:42:51 -0700 (PDT) X-Google-Smtp-Source: APBJJlFk08i8H4YNS/PSY7LclD+2276r6g0BdlKfWaq0JQtrFwTXIXSyD9Ut/ofpo2xBi9hAqFvo X-Received: by 2002:a17:906:3cb1:b0:99b:f08d:a390 with SMTP id b17-20020a1709063cb100b0099bf08da390mr3911968ejh.26.1690958570976; Tue, 01 Aug 2023 23:42:50 -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 b14-20020a1709062b4e00b00991cb7517bdsi10319322ejg.948.2023.08.01.23.42.50; Tue, 01 Aug 2023 23:42:50 -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=aeUPRrz3; 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 BD3BD68C5A9; Wed, 2 Aug 2023 09:42:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2068.outbound.protection.outlook.com [40.92.89.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A31368C489 for ; Wed, 2 Aug 2023 09:42:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PjxD//YmFqPU7duJT5Ercu+7jIMoan70DehODvQgRlSDlBr3+9W3WTDv2D0poZQKaasnIsgFGi6qIqAvEyvhlCk+KPUwLs9tL/uHs1VDuL3SQ738etFDcHbWglIK3/gW8Ix8KFQZkVT9Sr4k0ZeCPeBAwvlY3xJgDrx83aCYm6ZJskloemIZ6vsz9HROrXiA4daWlFL15lEUuzlihc5Ozo9tIDLRtpc5YAxwDv2TMhXSfsnxXGegr53kQNVcKn/7wRD6v62lG+TtlNYZfMTuKvo0sCk5977w69ZyqxEZ9Pv05iTj1WzY6T5jRMPUpwHE6zFEI8brr/6KQCqyY/iR6g== 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=yh0VYxc2uENDvPt8x5qLefNo3h9S5XZfr37ZvYS+trk=; b=L/96h5ggO+byoYzv9ErRIGS6OQj8NAXuzEkP0v4eXzh6pi4wVOKng4RPVxvGJZOR2l7prFSJVHm+MjYnhODe+w9r/cyJ4+DBL6wibmzgZTe7B1kjcd0wO5I2VwjdhVswLmgqifgYgxybn2XJ8KFAAuXuUlemEqDdfyuDnW2scI9gMGSq9xFJ/x+rJhM0kG+wmw+Yd1YVZ6YHdWUqnQ2c/P4Jyac/3FZsrImUuaePy0SSYUO7GdXznwD2oENlwphUfC/Iu+sLkjsod2S+Zs1xvfNtMNzwhnkEwEKrFYy4Dhi2SGrWkO02uuQ2tVkeMwc/+dvRoCUAIVTrAd4R5UkjHA== 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=yh0VYxc2uENDvPt8x5qLefNo3h9S5XZfr37ZvYS+trk=; b=aeUPRrz3Si65l4Lgx2FfdiU5xFoVEoqTePq/NY3CkysTqFCax+JxsjIMlIYGSQcJecVhSvOZW5viyzxiWm86kSmCpZcw5C/jafb5HOGz8SXkSQtRxpCssYqgQXknZEDfndcSM1Q7VVt9CH3b5hTp6VUgkIKjYKuZ98naEYf3WXnksuXCdC7ZFDgevR/VckJ6M+poQT1KGFeA0whISTcasCyspuzoMg97IJqLhr6yBT/OFFSFF2gkKcahgxXN5jsonU57nEsBHCsuRoN7shZ+xNsH1H3P2KxG5/ZPoEfbjv+hASBoKm9NJzizVZJd50z59dxuTA2gtOtOsKyWgqNMLw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0048.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:23b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 06:42:34 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c%7]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 06:42:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Aug 2023 08:43:30 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [j2ysBdH9YM2kvPpMhTMwwtXwWSsK7dK42THFjA90+/Q=] X-ClientProxiedBy: FR0P281CA0148.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:96::9) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230802064332.39795-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0048:EE_ X-MS-Office365-Filtering-Correlation-Id: afb99a63-4181-4056-5e63-08db9323a71b X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3kJA0tFqbs8en6JIaQ9AKh8qSxPTRkAlv5lLCzEadnPYCd0wftLHTGYsUN1sHCTfXBvgJE7OqjNGJKrR65K7d8/t8jQjKkwwyhbcuAhsQu6U1CNf0GcUHCYiTJROD/VUa1RKwM2ERrvZxsSV5n3/Pcn5HzXaViXhZmz6gqyBHAnFF9Ne/OLM2ZuIhOaon7rcre+u9gCFLCEEH0+LBwuv0uityert3ic0yKYhtsROqNi2WkcziRyxNccvaGNJMRUAnGLGn9wq3SVnaovS+hBEHVCRvFEg8uwfNmdTFU9ummOck2b5A4+3AENjX03Dm6QTyT+xc97bpyiDVBg1auI825cVKfR7PqGgU18ZDHqyys4X7LF2cVLTjDWkv8Ip4IVOaLRsBpnw6UDvTaHdLiA/X3j5zMlTO4kFlF5k1FiWZkPj2QeZfng0mWY/nHRqf0Zw0lRxUaAZlZRSEsyZVCGsMXF3OSeMIbUO2cIwXQGTe8rjdfx9DVicvemFnbCse+v9MJBK4sEu+SB8DFUGWpbEMIbyTUpQCunW9XDBj5fF5bnmg9609sR+zfivF8JpOw1boRHVWE/ZVowUNLZZo7m/U4WhSSl8MK1cTJrPnWwKuzusNycCzu3xpl7WruDfHVpAeUxotxifnfcFI0/4PTgdYHZB2tLLe/G+Vxu6RIm8CVSt3hPRwDNNiGEAtqPNZ+ra3lL8FB/kiSc27bLFSadur+mqZLxIcRv8h0/uWF+O3msk/l8C1bvakOL2iHOw37dYF/p8ztogtXNeFVomib3yzTU X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eri7LB3r9iuSux4tvJXiUVX9edBLA/mECV9HWEB1x3heJ/wCKqlWn6XEJK3jbvU0thGfmFW+39kpIvE3Qk976LVmrWIS9ljh8ED4SxOIJBoCn+Li8s6/UR+Juef2EVxPmtl+mJEStKEklRy1kQEZ1nY0GRooxojKU3Yb85ngJKjRIF9sLzaDXrjJTdZ9tisxlYP8+vJY3Go4Q6jPF8kzC3v051RHGqbpy7TdK2szTvFzUZl6RNmcvDodtQ/CV+c5t3YnuCua2RVhewZbqFkn9XFhe5+AZcdZA9CVwiuMSFWT/PLoKzVmHrAI0kVjIsO4TGB9wAhay/1G9V21BBoBVXzNsFU2VO9f/DD7JjhB6tNAWxUbTHwbQv8YXzTz30DzPPprrf6vEKfzyVk3zOn2//2XRV3h0VqAhu2AvfvysQZA68Br7bezK++9e/Hr5/pbHCJ5a1mZqnAczcxVqm24221SH7CVPkdqZp6tsbhqgOZ8ADRJdljfikKs1wxGpa74dAry4iXML40iixZ1SEXR/HQB0++AYrqG2fbm6fK5hneTPE5Xwnaa/uKs/H5/Oyitbo8x8R1bV6VLhEDG0MFu8NETR5dbdt54u2P8Xq7b3geD6sPthfxDEpuqXYFXIniS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tnSecI3ebphlbIT6L7v/echW8SY4NHFp0Z3fZjMynkw+PCqOxE2ZYk0Ws7DkC3iE6IMBnydO7ot+/gWi84h8ss2JEhgpqfJQDtw5yXw97v7k+IMw4v7hsnkBh7qKmZtDB3u5jE6yD1h0fiLlPwfIkyrD6luDYgL6+26FSNGueCyja//2dsGbWOmk16ksPACdTQxgas22Gwgzhncu0QPSlgThDw2gUYrBRCEXrEyBtLmBhEq+M8O6expV+rb3cqbDnhAL7aUlC2n8FCKft2CYqbpU2231wz+nuZIYZIkyaxwkH1DdOCLUt+SQ1HWicDKkgWzTGxdedHjEqrfyIS5VB3tzairSNF8jlvll7aBzU3HL1V8RcMB6atYAAAruc1gqepe/q5auEzENSAV2Ry/jkPCak5gG0XENY1qQx97NvZckyIs96b/kMQ/TIs6ij3YJrTCl/NN3ASZpWqxAvh7GJOkuRMtGNUYpd6IJ7/sAKYZpJA7qCIHAqaDjwEKts5/AeJi1qinLwjYEzxG0X3ptAtimFAWYGjv6utSdNN+O4ydSbwj355XrD048Mh6e3h56DfQhE6IfKmcRNhu66hXzHCidv70n0+JIXwhE39WU2s6V5vsIRZn9kOPDXth49yO3qurIWKGTrjsPcTZFiZI9ZO28BwuYf4KRfVM34jklwVxNXihgDqh7/TzAToHXMqZnb8TP9Aqyk9Ux/gkRB5yikFOHdkGfvlNqTlfWqEOtgt6B8aMkf0Gcv9/brfqH3HThWmAIAwg1ZQrvxY0cfxWhlQJRCSnjgl5MvR6GLiKOoGgmoyTvxNFbSxFuQ40pk3Q7q43g6vNhwm6f1sdYYMPdRol9PyehgRDvr7bADJfl1njXDyDbHHmGOHOOvA/Kiphua5a/FUO6pZNCvqclVemQ1Rmnk7Oia5msSB0HKJBWI7KxzMgzzi7QOD0A+hvisUfmhxqFqeYMh0LtnSOs0tswF8Al6aRwn4KRdHAtlZD69DMR9Yblr66hUrx30QTp9XMsGEL9JQbZpnedl1ByEIeLhj3PdNGkjyv+W9ahCh7m7CacgNHBqxRC1ESlaMM4n8rsqSiD28Nw+rhYlmU8Q3JpXRWmx9w4ydLA7tSLTkS4UaboH/NCQNTUIDb47lSrPs+nuhHYdHM0UsArWTva7Cz5wBwhaoFBJcihVUPZQE3LQb9Hj9XHr6g/HTvscwjGiF7zr9cqJDn1IlqEdh/RYp/XvDgwI5c5N5Z9EO64783zaHO4qAglvR+kp5Iwl/s7ucSz X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: afb99a63-4181-4056-5e63-08db9323a71b X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 06:42:34.2121 (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: DU2P250MB0048 Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/hwconfig: Move HWACCEL_CAP_* to a new header 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: g2/GJfEZvyYV libavcodec/hwconfig.h currently contains HWACCEL_CAP_* flags as well as the definition of AVCodecHWConfigInternal and some macros to create them. The users of these two are nearly disjoint: The flags are used by files providing AVHWAccels whereas AVCodecHWConfigInternal is used by files providing codecs (for FFCodec.hw_configs). This patch therefore moves these flags to a new file hwaccel_internal.h. Signed-off-by: Andreas Rheinhardt --- libavcodec/hwaccel_internal.h | 29 +++++++++++++++++++++++++++++ libavcodec/hwconfig.h | 5 ----- libavcodec/pthread_frame.c | 1 + libavcodec/vaapi_av1.c | 3 +-- libavcodec/vaapi_h264.c | 2 +- libavcodec/vaapi_hevc.c | 2 +- libavcodec/vaapi_mjpeg.c | 2 +- libavcodec/vaapi_mpeg2.c | 2 +- libavcodec/vaapi_mpeg4.c | 2 +- libavcodec/vaapi_vc1.c | 3 +-- libavcodec/vaapi_vp8.c | 2 +- libavcodec/vaapi_vp9.c | 2 +- libavcodec/vdpau_av1.c | 2 +- libavcodec/vdpau_h264.c | 2 +- libavcodec/vdpau_hevc.c | 2 +- libavcodec/vdpau_mpeg12.c | 2 +- libavcodec/vdpau_mpeg4.c | 2 +- libavcodec/vdpau_vc1.c | 2 +- libavcodec/vdpau_vp9.c | 3 +-- libavcodec/vulkan_decode.h | 2 +- 20 files changed, 47 insertions(+), 25 deletions(-) create mode 100644 libavcodec/hwaccel_internal.h diff --git a/libavcodec/hwaccel_internal.h b/libavcodec/hwaccel_internal.h new file mode 100644 index 0000000000..6e6f5c7cf9 --- /dev/null +++ b/libavcodec/hwaccel_internal.h @@ -0,0 +1,29 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * Header providing the internals of AVHWAccel. + */ + +#ifndef AVCODEC_HWACCEL_INTERNAL_H +#define AVCODEC_HWACCEL_INTERNAL_H + +#define HWACCEL_CAP_ASYNC_SAFE (1 << 0) +#define HWACCEL_CAP_THREAD_SAFE (1 << 1) + +#endif /* AVCODEC_HWACCEL_INTERNAL */ diff --git a/libavcodec/hwconfig.h b/libavcodec/hwconfig.h index e8c6186151..3b19d5edad 100644 --- a/libavcodec/hwconfig.h +++ b/libavcodec/hwconfig.h @@ -22,11 +22,6 @@ #include "avcodec.h" #include "hwaccels.h" - -#define HWACCEL_CAP_ASYNC_SAFE (1 << 0) -#define HWACCEL_CAP_THREAD_SAFE (1 << 1) - - typedef struct AVCodecHWConfigInternal { /** * This is the structure which will be returned to the user by diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index bc305f561f..c14010d803 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -31,6 +31,7 @@ #include "avcodec_internal.h" #include "codec_internal.h" #include "decode.h" +#include "hwaccel_internal.h" #include "hwconfig.h" #include "internal.h" #include "pthread_internal.h" diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c index d0339b2705..67ea6af697 100644 --- a/libavcodec/vaapi_av1.c +++ b/libavcodec/vaapi_av1.c @@ -19,8 +19,7 @@ */ #include "libavutil/frame.h" -#include "libavutil/pixdesc.h" -#include "hwconfig.h" +#include "hwaccel_internal.h" #include "vaapi_decode.h" #include "internal.h" #include "av1dec.h" diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c index 9332aa6f31..e7f8e920b2 100644 --- a/libavcodec/vaapi_h264.c +++ b/libavcodec/vaapi_h264.c @@ -22,7 +22,7 @@ #include "h264dec.h" #include "h264_ps.h" -#include "hwconfig.h" +#include "hwaccel_internal.h" #include "vaapi_decode.h" /** diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c index 8b12484fff..87584d1edb 100644 --- a/libavcodec/vaapi_hevc.c +++ b/libavcodec/vaapi_hevc.c @@ -25,7 +25,7 @@ #include "avcodec.h" #include "hevcdec.h" -#include "hwconfig.h" +#include "hwaccel_internal.h" #include "vaapi_decode.h" #include "vaapi_hevc.h" #include "h265_profile_level.h" diff --git a/libavcodec/vaapi_mjpeg.c b/libavcodec/vaapi_mjpeg.c index 81582114b6..1947540ea1 100644 --- a/libavcodec/vaapi_mjpeg.c +++ b/libavcodec/vaapi_mjpeg.c @@ -19,7 +19,7 @@ #include #include -#include "hwconfig.h" +#include "hwaccel_internal.h" #include "vaapi_decode.h" #include "mjpegdec.h" diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c index 5e2b889137..09636e0d26 100644 --- a/libavcodec/vaapi_mpeg2.c +++ b/libavcodec/vaapi_mpeg2.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "hwconfig.h" +#include "hwaccel_internal.h" #include "mpegutils.h" #include "mpegvideo.h" #include "mpegvideodec.h" diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c index 4e74e0382b..ff31ca4d92 100644 --- a/libavcodec/vaapi_mpeg4.c +++ b/libavcodec/vaapi_mpeg4.c @@ -23,7 +23,7 @@ #include "config_components.h" #include "h263.h" -#include "hwconfig.h" +#include "hwaccel_internal.h" #include "mpeg4videodec.h" #include "mpegvideo.h" #include "mpegvideodec.h" diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c index fb2132e814..a179e4df11 100644 --- a/libavcodec/vaapi_vc1.c +++ b/libavcodec/vaapi_vc1.c @@ -22,11 +22,10 @@ #include "config_components.h" -#include "hwconfig.h" +#include "hwaccel_internal.h" #include "mpegvideodec.h" #include "vaapi_decode.h" #include "vc1.h" -#include "vc1data.h" /** Translate FFmpeg MV modes to VA API */ static int get_VAMvModeVC1(enum MVModes mv_mode) diff --git a/libavcodec/vaapi_vp8.c b/libavcodec/vaapi_vp8.c index 5b18bf8f34..f833133f9f 100644 --- a/libavcodec/vaapi_vp8.c +++ b/libavcodec/vaapi_vp8.c @@ -19,7 +19,7 @@ #include #include -#include "hwconfig.h" +#include "hwaccel_internal.h" #include "vaapi_decode.h" #include "vp8.h" diff --git a/libavcodec/vaapi_vp9.c b/libavcodec/vaapi_vp9.c index 776382f683..cf735bb7b2 100644 --- a/libavcodec/vaapi_vp9.c +++ b/libavcodec/vaapi_vp9.c @@ -22,7 +22,7 @@ #include "libavutil/pixdesc.h" -#include "hwconfig.h" +#include "hwaccel_internal.h" #include "vaapi_decode.h" #include "vp9shared.h" diff --git a/libavcodec/vdpau_av1.c b/libavcodec/vdpau_av1.c index 3c3c8e61d1..557cbcebd7 100644 --- a/libavcodec/vdpau_av1.c +++ b/libavcodec/vdpau_av1.c @@ -25,7 +25,7 @@ #include "avcodec.h" #include "internal.h" #include "av1dec.h" -#include "hwconfig.h" +#include "hwaccel_internal.h" #include "vdpau.h" #include "vdpau_internal.h" diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c index 525e208495..1c5622662b 100644 --- a/libavcodec/vdpau_h264.c +++ b/libavcodec/vdpau_h264.c @@ -26,7 +26,7 @@ #include "avcodec.h" #include "h264dec.h" #include "h264_ps.h" -#include "hwconfig.h" +#include "hwaccel_internal.h" #include "mpegutils.h" #include "vdpau.h" #include "vdpau_internal.h" diff --git a/libavcodec/vdpau_hevc.c b/libavcodec/vdpau_hevc.c index 2669040f78..fb1b71abdc 100644 --- a/libavcodec/vdpau_hevc.c +++ b/libavcodec/vdpau_hevc.c @@ -25,7 +25,7 @@ #include "avcodec.h" #include "hevc_data.h" #include "hevcdec.h" -#include "hwconfig.h" +#include "hwaccel_internal.h" #include "vdpau.h" #include "vdpau_internal.h" #include "h265_profile_level.h" diff --git a/libavcodec/vdpau_mpeg12.c b/libavcodec/vdpau_mpeg12.c index 79007aa1a8..d7223cdb4a 100644 --- a/libavcodec/vdpau_mpeg12.c +++ b/libavcodec/vdpau_mpeg12.c @@ -26,7 +26,7 @@ #include #include "avcodec.h" -#include "hwconfig.h" +#include "hwaccel_internal.h" #include "mpegvideo.h" #include "vdpau.h" #include "vdpau_internal.h" diff --git a/libavcodec/vdpau_mpeg4.c b/libavcodec/vdpau_mpeg4.c index 1211b1df2c..ce6d421196 100644 --- a/libavcodec/vdpau_mpeg4.c +++ b/libavcodec/vdpau_mpeg4.c @@ -24,7 +24,7 @@ #include #include "avcodec.h" -#include "hwconfig.h" +#include "hwaccel_internal.h" #include "mpeg4videodec.h" #include "vdpau.h" #include "vdpau_internal.h" diff --git a/libavcodec/vdpau_vc1.c b/libavcodec/vdpau_vc1.c index 00b33f420b..851a89d7cf 100644 --- a/libavcodec/vdpau_vc1.c +++ b/libavcodec/vdpau_vc1.c @@ -26,7 +26,7 @@ #include #include "avcodec.h" -#include "hwconfig.h" +#include "hwaccel_internal.h" #include "vc1.h" #include "vdpau.h" #include "vdpau_internal.h" diff --git a/libavcodec/vdpau_vp9.c b/libavcodec/vdpau_vp9.c index 49fe18189b..1e6a1fc007 100644 --- a/libavcodec/vdpau_vp9.c +++ b/libavcodec/vdpau_vp9.c @@ -23,9 +23,8 @@ #include #include "libavutil/pixdesc.h" #include "avcodec.h" -#include "vp9data.h" +#include "hwaccel_internal.h" #include "vp9dec.h" -#include "hwconfig.h" #include "vdpau.h" #include "vdpau_internal.h" diff --git a/libavcodec/vulkan_decode.h b/libavcodec/vulkan_decode.h index 1b4e1cc712..0aaa2e2de0 100644 --- a/libavcodec/vulkan_decode.h +++ b/libavcodec/vulkan_decode.h @@ -20,7 +20,7 @@ #define AVCODEC_VULKAN_DECODE_H #include "decode.h" -#include "hwconfig.h" +#include "hwaccel_internal.h" #include "internal.h" #include "vulkan_video.h"