summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorMichael Maltese <michaeljosephmaltese@gmail.com>2017-05-26 00:32:35 -0700
committerMichael Maltese <michaeljosephmaltese@gmail.com>2017-05-26 00:53:58 -0700
commit53acd25de452c5efece3d3ee680b86e9acbeb514 (patch)
tree54cd9efbc91afba0f4d30f122bb4b69a4306dba9 /Source/Core
parent9dfd8bbf385fbe8063896a6a5d526f4223fe129f (diff)
Rename define HAVE_LIBAV->HAVE_FFMPEG
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/State.cpp2
-rw-r--r--Source/Core/DolphinWX/VideoConfigDiag.cpp4
-rw-r--r--Source/Core/VideoCommon/AVIDump.h2
-rw-r--r--Source/Core/VideoCommon/RenderBase.cpp8
4 files changed, 8 insertions, 8 deletions
diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp
index 915ae56104..0b3b530275 100644
--- a/Source/Core/Core/State.cpp
+++ b/Source/Core/Core/State.cpp
@@ -191,7 +191,7 @@ static std::string DoState(PointerWrap& p)
Gecko::DoState(p);
p.DoMarker("Gecko");
-#if defined(HAVE_LIBAV) || defined(_WIN32)
+#if defined(HAVE_FFMPEG) || defined(_WIN32)
AVIDump::DoState();
#endif
diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp
index 087ce9552d..1b8063e720 100644
--- a/Source/Core/DolphinWX/VideoConfigDiag.cpp
+++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp
@@ -239,7 +239,7 @@ static wxString internal_resolution_frame_dumping_desc = wxTRANSLATE(
"the size of the window it is displayed within. If the aspect ratio is widescreen, the output "
"image will be scaled horizontally to preserve the vertical resolution.\n\nIf unsure, leave "
"this unchecked.");
-#if defined(HAVE_LIBAV) || defined(_WIN32)
+#if defined(HAVE_FFMPEG) || defined(_WIN32)
static wxString use_ffv1_desc =
wxTRANSLATE("Encode frame dumps using the FFV1 codec.\n\nIf unsure, leave this unchecked.");
#endif
@@ -894,7 +894,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string& title)
wxGetTranslation(dump_efb_desc), vconfig.bDumpEFBTarget));
szr_utility->Add(CreateCheckBox(page_advanced, _("Free Look"),
wxGetTranslation(free_look_desc), vconfig.bFreeLook));
-#if defined(HAVE_LIBAV) || defined(_WIN32)
+#if defined(HAVE_FFMPEG) || defined(_WIN32)
szr_utility->Add(CreateCheckBox(page_advanced, _("Frame Dumps Use FFV1"),
wxGetTranslation(use_ffv1_desc), vconfig.bUseFFV1));
#endif
diff --git a/Source/Core/VideoCommon/AVIDump.h b/Source/Core/VideoCommon/AVIDump.h
index fcc3ddb2ce..521f0d792b 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_LIBAV) || defined(_WIN32)
+#if defined(HAVE_FFMPEG) || defined(_WIN32)
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 ff390a8c7d..baa8b73b37 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_LIBAV) || defined(_WIN32)
+#if defined(HAVE_FFMPEG) || defined(_WIN32)
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_LIBAV) && !defined(_WIN32)
+#if !defined(HAVE_FFMPEG) && !defined(_WIN32)
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_LIBAV) || defined(_WIN32)
+#if defined(HAVE_FFMPEG) || defined(_WIN32)
bool Renderer::StartFrameDumpToAVI(const FrameDumpConfig& config)
{
@@ -932,7 +932,7 @@ void Renderer::StopFrameDumpToAVI()
{
}
-#endif // defined(HAVE_LIBAV) || defined(WIN32)
+#endif // defined(HAVE_FFMPEG) || defined(WIN32)
std::string Renderer::GetFrameDumpNextImageFileName() const
{