diff options
| author | Michael Maltese <michaeljosephmaltese@gmail.com> | 2017-05-22 12:27:10 -0700 |
|---|---|---|
| committer | Michael Maltese <michaeljosephmaltese@gmail.com> | 2017-05-26 00:53:58 -0700 |
| commit | 3ca03373ae993e69088a33458e16afe1ee946eee (patch) | |
| tree | 6373f7210e7ced71e81c99b68c88fb99cec8aead /Source/Core/VideoCommon | |
| parent | 53acd25de452c5efece3d3ee680b86e9acbeb514 (diff) | |
MSVC: define HAVE_FFMPEG
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/AVIDump.h | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/RenderBase.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/VideoCommon/AVIDump.h b/Source/Core/VideoCommon/AVIDump.h index 521f0d792b..065a5d63d0 100644 --- a/Source/Core/VideoCommon/AVIDump.h +++ b/Source/Core/VideoCommon/AVIDump.h @@ -27,7 +27,7 @@ public: static void Stop(); static void DoState(); -#if defined(HAVE_FFMPEG) || defined(_WIN32) +#if defined(HAVE_FFMPEG) static Frame FetchState(u64 ticks); #else static Frame FetchState(u64 ticks) { return {}; } diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index baa8b73b37..42f07ef403 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -774,7 +774,7 @@ bool Renderer::IsFrameDumping() if (m_screenshot_request.IsSet()) return true; -#if defined(HAVE_FFMPEG) || defined(_WIN32) +#if defined(HAVE_FFMPEG) if (SConfig::GetInstance().m_DumpFrames) return true; #endif @@ -828,7 +828,7 @@ void Renderer::RunFrameDumps() bool frame_dump_started = false; // If Dolphin was compiled without libav, we only support dumping to images. -#if !defined(HAVE_FFMPEG) && !defined(_WIN32) +#if !defined(HAVE_FFMPEG) if (dump_to_avi) { WARN_LOG(VIDEO, "AVI frame dump requested, but Dolphin was compiled without libav. " @@ -900,7 +900,7 @@ void Renderer::RunFrameDumps() } } -#if defined(HAVE_FFMPEG) || defined(_WIN32) +#if defined(HAVE_FFMPEG) bool Renderer::StartFrameDumpToAVI(const FrameDumpConfig& config) { @@ -932,7 +932,7 @@ void Renderer::StopFrameDumpToAVI() { } -#endif // defined(HAVE_FFMPEG) || defined(WIN32) +#endif // defined(HAVE_FFMPEG) std::string Renderer::GetFrameDumpNextImageFileName() const { |