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 C345946BBA for ; Sat, 5 Aug 2023 10:00:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8FD4968C6E8; Sat, 5 Aug 2023 13:00:23 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2033.outbound.protection.outlook.com [40.92.91.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0069D68C1D7 for ; Sat, 5 Aug 2023 13:00:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Son/7CCqAQqbsotq2TeHRP0lY3tPSo9bKa30je0egBFUI0Xl+31HTvky3N28g50Oa8WvtL1O4gyZ6gELzuPXNgNLmZ39rUAMto4ukMxrE5Ab6PFvjE0CslN7LPd/+Qrr/gnYpbK/7zq95M22mblSFsr6XnAoGRsSWTY3Tkbtb5CVxL1PpPz1w3m+/ATQA4gqjn6iiKgP73C20cI9yeUB3a8BWnapxU+DSk7IOdDF0Keu2WEUazI5IU+hviuA/XBCL0budsVqt83YQ+A9AE6A1hzpwIc4G9y+ldgkPEDq+wLLHgZ+5oTaNT2YLo+e3iW6SSFcV5OYh25W7o9VAKUlhQ== 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=R2UdBg4HUzPC+AggoflP9qsT8CAxvLovm4pz+DYnihY=; b=EhwumQve5lEB2tfzvZ94x0gWTt2acg2lgqkQM5et8b6vTwuKVqChlB/KqU2DgHznztmQ1hldHiE2Gk30ylYVb8jzmMHftB+O/869mjkIop6BdRZJT1AuEFIccI0uTXTc948Blv8NmLZ665AoiCYE8/3VfxKom6I6p3QiR2iXeuthN0tKyAeJ6j/lfnJk5JwR8dhLNCZBV///poHnXZnDdod+l/Q3Q3ZNGQ+Wh7WUut1YZyGqnJe6EtZF32wd78LhjC4YmDY/vx9LvnYezkFqQ3lxELZEaKcnxrwWlYUFM+q3ndfaeMhx6IxrcHa/HSQOQW1PdysHrGTupHjwW/RnZw== 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=R2UdBg4HUzPC+AggoflP9qsT8CAxvLovm4pz+DYnihY=; b=b4u9PqMSxQ1/zCHJRALhmPIk9hFaYMeVkU4wKOuvqkjuNRsSwKtIcAVVyif4iXQnW3/27MjrWauQxdaWxA2Svf94e9h7r2u3JcKCRHBqT7MijChCcr6B7JeDBrkWAV3EoN/QP2z7tikdwV7zE0LSRCVID0NylsoKTNBh3Yjz85MjhN1BueLJrOGB+fSe/hZ1M3O9hsWyN33Vt1NthOsdmviFTBkr9jwStC8FpUkv5h9iBbUMfglKfohfkJ9D+wmuTZbaVweuaYFuX0txOn0PWChMDJy7GbtEIPUScUJjaTvJ+8Urdrb5pdDnIDXuT+4epIu2VPIpgaOIiEAz7puPGQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0164.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:177::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.22; Sat, 5 Aug 2023 10:00:14 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Sat, 5 Aug 2023 10:00:14 +0000 Message-ID: Date: Sat, 5 Aug 2023 12:01:28 +0200 To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [mhdUx49pfcErkM4hWLcHfZxtyCqjIlED1oPVnmrnavI=] X-ClientProxiedBy: FR3P281CA0191.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a4::9) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <30511d2d-7452-434e-d6a1-81e1f903f157@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0164:EE_ X-MS-Office365-Filtering-Correlation-Id: 69447b1a-febd-4652-9264-08db959ac392 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Hbbb2qjK4LfLWjK3vKohSvtDtUWjGlBwwothdN13wS5tmsRjApVTsKF9iqkplIzH56hJr/p7iRQAt05LW91c6tXaX0OCvJmjXBOPED9NQY6uCitVeH0n1/+puJ30X3C8c9cQiFQp4VogE9XwvXBPdU4ClDOvmd1NGsxqXtiZHoFFusGrLjpHN+5EU87sayXJ92QCLjt1AEUuqLc/QSrjDKi4iBv6FMrI9vxN8n7opTJUhUItD3k7RvwWlwpWMf5Zn7N6OCj3JLSPyEIWKi1IK1kOJ+Lc27wV+3yBPIhLUvzN593by6kTaTXjacqjpyCwJfdUafwIDnQOMqzT6kYg8a5143s/YmOXhe0gNXSUzgAxMZB0fWTUJazV9oZQ2bdfMYzHpOA9UiCk1KXd1nub0oxZ1w0FXFswwISgXeThU54qkdGF6Y7iwfqTCqUR0EzwJpp6GW/yMOZFhbM5KtOuVlWiOmstKpebSnuEM0pyk7B/rVUFv3KcZO/QgFxca12rN/yke5NcuYiIOsY56BjqrrC3ajs6BiDJApKsfjovKBNi/lWhR9BtOXbXXxctUygk X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?a1RoZll6aUd5aVRYSE5sam53TUh4dnFFUUNsMEpGclNrOHF0Z1BiV1pVczhO?= =?utf-8?B?V3ZxNFRWazBwR01LT2w0dXBZTTJIb3A2RkYrYmV0THhFa2FWSzFZMy90Ujda?= =?utf-8?B?OVNNaWdyTVdxWk1Ia0NodHJ4UTFNNlVpNXBUMXZDZDBJV2hpSE52TGNlM25O?= =?utf-8?B?RUlmeTVMd2F6eU1pUVRGSU85M3IzWVQzbS9wMm8zNjExaWErYWJqSTI5aTZv?= =?utf-8?B?dDZrVkw4N3FtNm9wL0JYc3N3bjZlSEdvWFhrZzlMSjFoSFM0QWtkamlLT2Qy?= =?utf-8?B?cHdFVXUvQUhaTEVuNVE4TkhYaHFIclYzVUlncDhCaTROZGlCaTRJb1VXZUdr?= =?utf-8?B?T2FSNnJBVFJsT2l0RkhvcG4wQWM5dHZkMXJFQmYxOHJ2U3l1QU94OTh0cmlV?= =?utf-8?B?NjJxa2JiQTBuYVFqTUZjVlVCMVNuNmJnKzdMa0ZrL1BPZjVrUUhtZUd5TnpH?= =?utf-8?B?THpnTmFQTUNsUU5QNW5JY0wzVHhPdk4zQzlieVpZU0JES1grSXhTRHdHWUJV?= =?utf-8?B?Yk56by9lNTJFNTBDOExUS3RSeDRsS3dpREpiVVpRdms4dlFlSlNxYVg3LzRx?= =?utf-8?B?MjVwZjN1WXA3R0htcXlXSDkxbzcxTGVXdlNyUG9nekc1Q0t3NzU0L2pjTEtP?= =?utf-8?B?ZWZsM1pxMVNycVcxcTF6ZkxyYW9HYVZSYjFCU09YbXZXSi9XV055YjFnL0dk?= =?utf-8?B?eUJNUkh0Q3NZb2xhdWVsc3FxaEY3U3hsdGhyR05qSW4yblhIb2R6TkZBVzhn?= =?utf-8?B?c2t0SVpFem56Q2Q2VERLODFNY0NzTWpObU5IWjBVaktoZFhJTGUzWnJheHc3?= =?utf-8?B?SGpCaWh0bmVyQ3JKYlVON2s5Qitoajd3cTJsV284alBLZTBSQzc4WjMzUStw?= =?utf-8?B?TlBjWmZzK1lhRHNYVmlrRlZKcTlwK3c2MlR1SGkxOVNDOTBmbW9UeXpJbXVV?= =?utf-8?B?dnJmQmJRVENQcHVEb2E2QUhPOHFLZ0hSVmc3L0FUeVd1dnFNL3AyaXZxaFV3?= =?utf-8?B?NzR6WGNrSkNFNEVST0Y4QmkzaWVpZkJOdGcxUTRUNWRoL3VPUTNId01EMHJ4?= =?utf-8?B?Ty9NWWY0UldiREZlMnVaRlZLWXRweS9DSllrSlVrNXgzcVVzQ1hOMHdTbWll?= =?utf-8?B?bVRHQ3d6WXo2RVZxUlRZQ3VJZHpRZ3Bjc2RuRkthNWxMakFialVkWWZEOVA1?= =?utf-8?B?VEp1a2xhRmxnRkM1bVRQRUMxTGYwM1BKdjlFMWFhM2ZtTlN0LzZiRVVNYWpC?= =?utf-8?B?ZlYrWHF6cnUzWnhteDc1TGVVQVFlckN3N3MvcmpQb3NLdG9hTWhvVk1pek0y?= =?utf-8?B?dmpOR0ZReGFndTdraHhHZGdQVUk3QVUwazBKanJ4VG9KWmJuNFUvd29CSys2?= =?utf-8?B?dGZTeTBjbDBhVkwxN0FWbEIyOWx4eFVUUjV0UWt6aDBidVppT2JxT1JQb2JQ?= =?utf-8?B?M09vUzJ1dURCWGJOSW9XUEE1WUszQWhUK2pJSks5b0EvYlRRWDVtV1lqazVV?= =?utf-8?B?c3phT2VERVJ0RURqb1NFM3RuR3B5VjB5dFpyYVZsUzAxdjM5M1kyd2sySExt?= =?utf-8?B?WnF6bmN2Q2UzOFEybm1ERE9FVjBZdUNKamdUR05qb2dTZm9CZTZ4a0FDRUFG?= =?utf-8?B?dmJ4UDlpMU5XbXEzSmxVeUJTU3BzNHF3Nm04WHNNVFhNN2puRGFtZlVEay83?= =?utf-8?Q?kdKMLvtHJ5VZ1oH6GxfT?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69447b1a-febd-4652-9264-08db959ac392 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2023 10:00:14.4216 (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: PR3P250MB0164 Subject: Re: [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 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: Andreas Rheinhardt: > 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" Will apply the hwaccel_internal.h patches in two days unless there are objections. - Andreas _______________________________________________ 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".