The branch, master has been updated
via 570949822b0fdfee96b055a8d4cce345a5334203 (commit)
via d74d3080ffdd358c595cf363f4053860d8fbb17d (commit)
from 9e3c07f2dfaaf55690a83b173778487ce5c9a484 (commit)
- Log -----------------------------------------------------------------
commit 570949822b0fdfee96b055a8d4cce345a5334203
Author: Timo Rothenpieler <[email protected]>
AuthorDate: Sun Sep 14 20:46:29 2025 +0200
Commit: Timo Rothenpieler <[email protected]>
CommitDate: Sun Sep 14 20:46:29 2025 +0200
avfilter/vsrc_gfxcapture: MapWindowPoints can return 0 and still succeed
diff --git a/libavfilter/vsrc_gfxcapture_winrt.cpp
b/libavfilter/vsrc_gfxcapture_winrt.cpp
index 89cbdd3df9..49181f1c0e 100644
--- a/libavfilter/vsrc_gfxcapture_winrt.cpp
+++ b/libavfilter/vsrc_gfxcapture_winrt.cpp
@@ -264,7 +264,8 @@ static int wgc_calculate_client_area(AVFilterContext *avctx)
return AVERROR_EXTERNAL;
}
- if (!MapWindowPoints(ctx->capture_hwnd, nullptr, (POINT*)&client_rect, 2))
{
+ SetLastError(0);
+ if (!MapWindowPoints(ctx->capture_hwnd, nullptr, (POINT*)&client_rect, 2)
&& GetLastError()) {
av_log(avctx, AV_LOG_ERROR, "MapWindowPoints failed\n");
return AVERROR_EXTERNAL;
}
commit d74d3080ffdd358c595cf363f4053860d8fbb17d
Author: Timo Rothenpieler <[email protected]>
AuthorDate: Sun Sep 14 18:47:02 2025 +0200
Commit: Timo Rothenpieler <[email protected]>
CommitDate: Sun Sep 14 20:33:24 2025 +0200
avfilter/vsrc_gfxcapture: make checkheaders happy
diff --git a/libavfilter/vsrc_gfxcapture.h b/libavfilter/vsrc_gfxcapture.h
index 617f48de22..f541f9ba21 100644
--- a/libavfilter/vsrc_gfxcapture.h
+++ b/libavfilter/vsrc_gfxcapture.h
@@ -19,6 +19,10 @@
#ifndef AVFILTER_VSRC_GFXCAPTURE_H
#define AVFILTER_VSRC_GFXCAPTURE_H
+#include "libavutil/log.h"
+#include "libavutil/rational.h"
+#include "libavfilter/avfilter.h"
+
typedef struct GfxCaptureContextCpp GfxCaptureContextCpp;
enum GfxResizeMode {
diff --git a/libavfilter/vsrc_gfxcapture_winrt.cpp
b/libavfilter/vsrc_gfxcapture_winrt.cpp
index 42977efcc5..89cbdd3df9 100644
--- a/libavfilter/vsrc_gfxcapture_winrt.cpp
+++ b/libavfilter/vsrc_gfxcapture_winrt.cpp
@@ -16,24 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-extern "C" {
-#include "config.h"
-}
-
-#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0A00
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0A00
-#endif
-
-#define WINDOWS_FOUNDATION_UNIVERSALAPICONTRACT_VERSION 0x130000
-
-// work around bug in mingw double-defining IReference<unsigned char> (BYTE ==
boolean)
-#define ____FIReference_1_boolean_INTERFACE_DEFINED__
+#include "vsrc_gfxcapture_winrt.hpp"
+#include "vsrc_gfxcapture_shader.h"
-#include <windows.h>
-#include <initguid.h>
-#include <wrl.h>
-#include <roapi.h>
#include <dwmapi.h>
#include <d3d11.h>
#include <d3dcompiler.h>
@@ -66,16 +51,12 @@ extern "C" {
#include <atomic>
#include <cinttypes>
#include <condition_variable>
-#include <functional>
#include <memory>
#include <mutex>
#include <regex>
#include <string>
#include <type_traits>
-#include "vsrc_gfxcapture_winrt.h"
-#include "vsrc_gfxcapture_shader.h"
-
using namespace ABI::Windows::System;
using namespace ABI::Windows::Foundation;
using namespace ABI::Windows::Graphics::Capture;
diff --git a/libavfilter/vsrc_gfxcapture_winrt.h
b/libavfilter/vsrc_gfxcapture_winrt.hpp
similarity index 92%
rename from libavfilter/vsrc_gfxcapture_winrt.h
rename to libavfilter/vsrc_gfxcapture_winrt.hpp
index d6f11e4ef5..a02e768c8f 100644
--- a/libavfilter/vsrc_gfxcapture_winrt.h
+++ b/libavfilter/vsrc_gfxcapture_winrt.hpp
@@ -19,6 +19,30 @@
#ifndef AVFILTER_VSRC_GFXCAPTURE_WINRT_H
#define AVFILTER_VSRC_GFXCAPTURE_WINRT_H
+extern "C" {
+#include "config.h"
+}
+
+#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0A00
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0A00
+#endif
+
+#define WINDOWS_FOUNDATION_UNIVERSALAPICONTRACT_VERSION 0x130000
+
+// work around bug in mingw double-defining IReference<unsigned char> (BYTE ==
boolean)
+#define ____FIReference_1_boolean_INTERFACE_DEFINED__
+
+#include <windows.h>
+#include <initguid.h>
+#include <wrl.h>
+#include <roapi.h>
+#include <windows.foundation.h>
+
+#include <atomic>
+#include <functional>
+#include <memory>
+
// Forward-declare IDirect3DDxgiInterfaceAccess if headers too old
#if !HAVE_IDIRECT3DDXGIINTERFACEACCESS
namespace Windows::Graphics::DirectX::Direct3D11 {
-----------------------------------------------------------------------
Summary of changes:
libavfilter/vsrc_gfxcapture.h | 4 ++++
libavfilter/vsrc_gfxcapture_winrt.cpp | 26 ++++------------------
...fxcapture_winrt.h => vsrc_gfxcapture_winrt.hpp} | 24 ++++++++++++++++++++
3 files changed, 32 insertions(+), 22 deletions(-)
rename libavfilter/{vsrc_gfxcapture_winrt.h => vsrc_gfxcapture_winrt.hpp} (92%)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
