[vlc-commits] [Git][videolan/vlc][master] 4 commits: d3d11_filters: only define D3D1_VIDEO_PROCESSOR enums for old mingw-w64

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
4620e69c by Steve Lhomme at 2023-04-08T06:30:16+00:00
d3d11_filters: only define D3D1_VIDEO_PROCESSOR enums for old mingw-w64

- - - - -
d8bd8e1f by Steve Lhomme at 2023-04-08T06:30:16+00:00
win32: remove unneeded w32api.h include

- - - - -
ea197ba0 by Steve Lhomme at 2023-04-08T06:30:16+00:00
vlc_fixups: don't force __STDC_*_MACROS on mingw-w64

__STDC_FORMAT_MACROS has no effect
__STDC_CONSTANT_MACROS and __STDC_LIMIT_MACROS are already set when
compiling for C++11 since mingw-w64 4.0.1

- - - - -
c1bac1a8 by Steve Lhomme at 2023-04-08T06:30:16+00:00
dshow: remove unneded QACONTAINERFLAGS hack

QACONTAINERFLAGS is defined properly in minwg-w64

- - - - -


4 changed files:

- include/vlc_fixups.h
- modules/access/dshow/filter.cpp
- modules/hw/d3d11/d3d11_filters.c
- src/win32/dirs.c


Changes:

=====================================
include/vlc_fixups.h
=====================================
@@ -108,7 +108,7 @@ typedef unsigned short mode_t;
 
 /* C++11 says there's no need to define __STDC_*_MACROS when including
  * inttypes.h and stdint.h. */
-#if defined (__cplusplus) && (defined(__MINGW32__) || defined(__UCLIBC__))
+#if defined (__cplusplus) && defined(__UCLIBC__)
 # ifndef __STDC_FORMAT_MACROS
 #  define __STDC_FORMAT_MACROS 1
 # endif


=====================================
modules/access/dshow/filter.cpp
=====================================
@@ -31,11 +31,6 @@
 #include <vlc_common.h>
 #include <vlc_fourcc.h>
 
-#ifndef _MSC_VER
-    /* Work-around a bug in w32api-2.5 */
-#   define QACONTAINERFLAGS QACONTAINERFLAGS_SOMETHINGELSE
-#endif
-
 #include "access.h"
 #include "filter.h"
 


=====================================
modules/hw/d3d11/d3d11_filters.c
=====================================
@@ -42,12 +42,12 @@
 #include "d3d11_processor.h"
 #include "../../video_chroma/d3d11_fmt.h"
 
-#ifdef __MINGW32__
+#if defined(__MINGW64_VERSION_MAJOR) && __MINGW64_VERSION_MAJOR < 8
 #define D3D11_VIDEO_PROCESSOR_FILTER_CAPS_BRIGHTNESS   0x1
 #define D3D11_VIDEO_PROCESSOR_FILTER_CAPS_CONTRAST     0x2
 #define D3D11_VIDEO_PROCESSOR_FILTER_CAPS_HUE          0x4
 #define D3D11_VIDEO_PROCESSOR_FILTER_CAPS_SATURATION   0x8
-#endif
+#endif // __MINGW64_VERSION_MAJOR<8
 
 #define PROCESSOR_SLICES 2
 


=====================================
src/win32/dirs.c
=====================================
@@ -30,9 +30,6 @@
 #endif
 #include <vlc_common.h>
 
-#ifdef __MINGW32__
-# include <w32api.h>
-#endif
 #include <direct.h>
 #include <shlobj.h>
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/72c34ac178d835a549920ece08a0e4edefe12351...c1bac1a85d504b2d25185eabfa2823fe8a2508f7

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/72c34ac178d835a549920ece08a0e4edefe12351...c1bac1a85d504b2d25185eabfa2823fe8a2508f7
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance