Skip to content

V
vlc-2-2
Commit 0c5887ee authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

Remove mingw-w64 2.0 workarounds

parent 20dd3ed4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 13 deletions
modules/access/dshow/vlc_dshow.h
View file @ 0c5887ee
......@@ -39,13 +39,7 @@
#include <ksmedia.h>
#include <ddraw.h>
#ifdef __MINGW64_VERSION_MAJOR
#if __MINGW64_VERSION_MAJOR < 3
DEFINE_GUID(MEDIASUBTYPE_I420,0x30323449,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);
#endif
#else /* !__MINGW64_VERSION_MAJOR */
#ifndef __MINGW64_VERSION_MAJOR
#include <dshow.h>
......
modules/codec/avcodec/dxva2.c
View file @ 0c5887ee
......@@ -75,12 +75,7 @@
#ifdef __MINGW32__
# include <_mingw.h>
# if defined(__MINGW64_VERSION_MAJOR) && __MINGW64_VERSION_MAJOR < 3
# undef IDirect3DDeviceManager9_Release
# define IDirect3DDeviceManager9_Release(This) (This)->lpVtbl->Release(This)
# endif
# if !defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 3
# if !defined(__MINGW64_VERSION_MAJOR)
# undef MS_GUID
# define MS_GUID DEFINE_GUID /* dxva2api.h fails to declare those, redefine as static */
# define DXVA2_E_NEW_VIDEO_DEVICE MAKE_HRESULT(1, 4, 4097)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment