From fabbad5370366c04e4fdd3d19956363ef32a6f16 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Thu, 16 Aug 2018 00:02:43 -0700 Subject: [PATCH] Fix build error on Windows and warnings --- app/streaming/video/ffmpeg-renderers/dxva2.cpp | 6 +----- app/streaming/video/ffmpeg-renderers/vt.mm | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/streaming/video/ffmpeg-renderers/dxva2.cpp b/app/streaming/video/ffmpeg-renderers/dxva2.cpp index 19dfeba6..dba799ba 100644 --- a/app/streaming/video/ffmpeg-renderers/dxva2.cpp +++ b/app/streaming/video/ffmpeg-renderers/dxva2.cpp @@ -430,16 +430,12 @@ bool DXVA2Renderer::isDecoderBlacklisted() 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_VideoWidth = width; 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 // currently running on right now. We must set this hint so SDL will pass // D3DCREATE_MULTITHREADED to IDirect3D9::CreateDevice(). diff --git a/app/streaming/video/ffmpeg-renderers/vt.mm b/app/streaming/video/ffmpeg-renderers/vt.mm index 59177e50..e764065b 100644 --- a/app/streaming/video/ffmpeg-renderers/vt.mm +++ b/app/streaming/video/ffmpeg-renderers/vt.mm @@ -97,7 +97,7 @@ public: int videoFormat, int, int, - int maxFps) override + int) override { int err;