forked from BtbN/FFmpeg-Builds
-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
a478df5
commit 55e12b2
Showing
2 changed files
with
46 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
patches/ffmpeg/master/0002-avcodec-vulkan_encode-Use-the-correct-Vulkan-NULL-ty.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
From 05d25d766dbb5a8f93ecf3ab95e04cabdc658466 Mon Sep 17 00:00:00 2001 | ||
From: nihil-admirari <[email protected]> | ||
Date: Sun, 22 Sep 2024 21:18:28 +0300 | ||
Subject: [PATCH] avcodec/vulkan_encode: Use the correct Vulkan NULL type | ||
|
||
Fixes build issue for Win32 targets | ||
--- | ||
libavcodec/vulkan_encode_h264.c | 2 +- | ||
libavcodec/vulkan_encode_h265.c | 2 +- | ||
2 files changed, 2 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/libavcodec/vulkan_encode_h264.c b/libavcodec/vulkan_encode_h264.c | ||
index af229af..a67e177 100644 | ||
--- a/libavcodec/vulkan_encode_h264.c | ||
+++ b/libavcodec/vulkan_encode_h264.c | ||
@@ -1048,7 +1048,7 @@ static int create_session_params(AVCodecContext *avctx) | ||
.sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR, | ||
.pNext = &h264_params, | ||
.videoSession = ctx->common.session, | ||
- .videoSessionParametersTemplate = NULL, | ||
+ .videoSessionParametersTemplate = VK_NULL_HANDLE, | ||
}; | ||
|
||
/* Create session parameters */ | ||
diff --git a/libavcodec/vulkan_encode_h265.c b/libavcodec/vulkan_encode_h265.c | ||
index 3cb7a3b..2082cec 100644 | ||
--- a/libavcodec/vulkan_encode_h265.c | ||
+++ b/libavcodec/vulkan_encode_h265.c | ||
@@ -1201,7 +1201,7 @@ static int create_session_params(AVCodecContext *avctx) | ||
.sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR, | ||
.pNext = &h265_params, | ||
.videoSession = ctx->common.session, | ||
- .videoSessionParametersTemplate = NULL, | ||
+ .videoSessionParametersTemplate = VK_NULL_HANDLE, | ||
}; | ||
|
||
/* Create session parameters */ | ||
-- | ||
2.43.0 | ||
|