| Message ID | 20231221094438.77841-1-martin@martin.st |
|---|---|
| State | Accepted |
| Commit | 327685bafe230af9fbaf06e85dd76ab7fa68e3a5 |
| Headers | show |
| Series | [FFmpeg-devel] d3d12va: Add a missing include for the declaration of ff_d3d12va_get_surface_index | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Thu, 21 Dec 2023, Martin Storsjö wrote: > This fixes the following build error: > > src/libavcodec/d3d12va_decode.c:49:10: error: no previous prototype for function > 'ff_d3d12va_get_surface_index' [-Werror,-Wmissing-prototypes] > 49 | unsigned ff_d3d12va_get_surface_index(const AVCodecContext *avctx, > | ^ > --- > libavcodec/d3d12va_decode.c | 1 + > 1 file changed, 1 insertion(+) Even after this change, the build still fails on a later file: src/libavutil/hwcontext_d3d12va.c:74:13: error: no previous prototype for function 'av_d3d12va_map_sw_to_hw_format' [-Werror,-Wmissing-prototypes] 74 | DXGI_FORMAT av_d3d12va_map_sw_to_hw_format(enum AVPixelFormat pix_fmt) | ^ There's no declaration of this in any header - so please either make it static or ff_ prefixed, or add it to a header with the declaration visible at the function definition. // Martin
>-----Original Message----- >From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of >Martin Storsjö >Sent: Thursday, December 21, 2023 5:45 PM >To: ffmpeg-devel@ffmpeg.org >Cc: Xiang, Haihao <haihao.xiang@intel.com> >Subject: [FFmpeg-devel] [PATCH] d3d12va: Add a missing include for the >declaration of ff_d3d12va_get_surface_index > >This fixes the following build error: > >src/libavcodec/d3d12va_decode.c:49:10: error: no previous prototype for >function > 'ff_d3d12va_get_surface_index' [-Werror,-Wmissing-prototypes] > 49 | unsigned ff_d3d12va_get_surface_index(const AVCodecContext *avctx, > | ^ >--- > libavcodec/d3d12va_decode.c | 1 + > 1 file changed, 1 insertion(+) > >diff --git a/libavcodec/d3d12va_decode.c b/libavcodec/d3d12va_decode.c >index 03e565066c..e0b67bf964 100644 >--- a/libavcodec/d3d12va_decode.c >+++ b/libavcodec/d3d12va_decode.c >@@ -33,6 +33,7 @@ > #include "avcodec.h" > #include "decode.h" > #include "d3d12va_decode.h" >+#include "dxva2_internal.h" > > typedef struct HelperObjects { > ID3D12CommandAllocator *command_allocator; >-- >2.34.1 > LGTM, thx. >_______________________________________________ >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".
>From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of >Martin Storsjö >Sent: Thursday, December 21, 2023 5:48 PM >To: ffmpeg-devel@ffmpeg.org >Cc: Xiang, Haihao <haihao.xiang@intel.com> >Subject: Re: [FFmpeg-devel] [PATCH] d3d12va: Add a missing include for the >declaration of ff_d3d12va_get_surface_index > >On Thu, 21 Dec 2023, Martin Storsjö wrote: > >> This fixes the following build error: >> >> src/libavcodec/d3d12va_decode.c:49:10: error: no previous prototype for >function >> 'ff_d3d12va_get_surface_index' [-Werror,-Wmissing-prototypes] >> 49 | unsigned ff_d3d12va_get_surface_index(const AVCodecContext *avctx, >> | ^ >> --- >> libavcodec/d3d12va_decode.c | 1 + >> 1 file changed, 1 insertion(+) > >Even after this change, the build still fails on a later file: > >src/libavutil/hwcontext_d3d12va.c:74:13: error: no previous prototype for >function 'av_d3d12va_map_sw_to_hw_format' [-Werror,-Wmissing- >prototypes] > 74 | DXGI_FORMAT av_d3d12va_map_sw_to_hw_format(enum >AVPixelFormat pix_fmt) > | ^ > >There's no declaration of this in any header - so please either make it >static or ff_ prefixed, or add it to a header with the declaration visible >at the function definition. > >// Martin Thanks for pointing this out. I've sent a patch to remove this function. It's been useless after the d3d format became public at some previous version. > >_______________________________________________ >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".
diff --git a/libavcodec/d3d12va_decode.c b/libavcodec/d3d12va_decode.c index 03e565066c..e0b67bf964 100644 --- a/libavcodec/d3d12va_decode.c +++ b/libavcodec/d3d12va_decode.c @@ -33,6 +33,7 @@ #include "avcodec.h" #include "decode.h" #include "d3d12va_decode.h" +#include "dxva2_internal.h" typedef struct HelperObjects { ID3D12CommandAllocator *command_allocator;
This fixes the following build error: src/libavcodec/d3d12va_decode.c:49:10: error: no previous prototype for function 'ff_d3d12va_get_surface_index' [-Werror,-Wmissing-prototypes] 49 | unsigned ff_d3d12va_get_surface_index(const AVCodecContext *avctx, | ^ --- libavcodec/d3d12va_decode.c | 1 + 1 file changed, 1 insertion(+)