Skip to content
Snippets Groups Projects
Commit 81d9c4c7 authored by Johannes Kauffmann's avatar Johannes Kauffmann Committed by Jean-Baptiste Kempf
Browse files

d3d11_deinterlace: conditionally define d3d11 enum

Newer d3d11.h already defines the enum, resulting in the following error:

    ../../modules/hw/d3d11/d3d11_deinterlace.c:43:14: error: redefinition of typedef ‘D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS’ with different type
       43 | typedef UINT D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS;
          |              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    In file included from ../../modules/hw/d3d11/d3d11_deinterlace.c:36:
    /usr/share/mingw-w64/include/d3d11.h:954:3: note: previous declaration of ‘D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS’ with type ‘D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS’
      954 | } D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS;
          |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS is available since MinGW-W64 6.0.0:
https://github.com/mirror/mingw-w64/commit/474a85ab51aadbe24a03081684d9cd17dcc3b353

Contribs d3d11.h doesn't have it, but distro-provided d3d11.h does, so
check if the type is available.
parent 01b9288d
No related branches found
No related tags found
Loading
Pipeline #425075 passed with stages
in 20 minutes and 47 seconds
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment