From 53acd25de452c5efece3d3ee680b86e9acbeb514 Mon Sep 17 00:00:00 2001
From: Michael Maltese <michaeljosephmaltese@gmail.com>
Date: Fri, 26 May 2017 00:32:35 -0700
Subject: [PATCH] Rename define HAVE_LIBAV->HAVE_FFMPEG

---
 CMakeLists.txt                            | 2 +-
 Source/Core/Core/State.cpp                | 2 +-
 Source/Core/DolphinWX/VideoConfigDiag.cpp | 4 ++--
 Source/Core/VideoCommon/AVIDump.h         | 2 +-
 Source/Core/VideoCommon/RenderBase.cpp    | 8 ++++----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 975a06ad99..380193676b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -485,7 +485,7 @@ if(ENCODE_FRAMEDUMPS)
   find_package(FFmpeg COMPONENTS avcodec avformat avutil swscale)
   if(FFmpeg_FOUND)
     message(STATUS "libav/ffmpeg found, enabling AVI frame dumps")
-    add_definitions(-DHAVE_LIBAV)
+    add_definitions(-DHAVE_FFMPEG)
   else()
     message(STATUS "libav/ffmpeg not found, disabling AVI frame dumps")
   endif()
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
 {