Fix build error on Windows and warnings

This commit is contained in:
Cameron Gutman 2018-08-16 00:02:43 -07:00
parent 7d61acb2a8
commit fabbad5370
2 changed files with 2 additions and 6 deletions

View file

@ -430,16 +430,12 @@ bool DXVA2Renderer::isDecoderBlacklisted()
return result; return result;
} }
bool DXVA2Renderer::initialize(SDL_Window* window, int videoFormat, int width, int height, int maxFps) bool DXVA2Renderer::initialize(SDL_Window* window, int videoFormat, int width, int height, int)
{ {
m_VideoFormat = videoFormat; m_VideoFormat = videoFormat;
m_VideoWidth = width; m_VideoWidth = width;
m_VideoHeight = height; m_VideoHeight = height;
if (!m_Pacer.initialize(window, maxFps)) {
return false;
}
// FFmpeg will be decoding on different threads than the main thread that we're // FFmpeg will be decoding on different threads than the main thread that we're
// currently running on right now. We must set this hint so SDL will pass // currently running on right now. We must set this hint so SDL will pass
// D3DCREATE_MULTITHREADED to IDirect3D9::CreateDevice(). // D3DCREATE_MULTITHREADED to IDirect3D9::CreateDevice().

View file

@ -97,7 +97,7 @@ public:
int videoFormat, int videoFormat,
int, int,
int, int,
int maxFps) override int) override
{ {
int err; int err;