ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename define HAVE_LIBAV->HAVE_FFMPEG

This commit is contained in:
Michael Maltese 2017-05-26 00:32:35 -07:00
parent 9dfd8bbf38
commit 53acd25de4
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -485,7 +485,7 @@ if(ENCODE_FRAMEDUMPS)
find_package(FFmpeg COMPONENTS avcodec avformat avutil swscale) find_package(FFmpeg COMPONENTS avcodec avformat avutil swscale)
if(FFmpeg_FOUND) if(FFmpeg_FOUND)
message(STATUS "libav/ffmpeg found, enabling AVI frame dumps") message(STATUS "libav/ffmpeg found, enabling AVI frame dumps")
add_definitions(-DHAVE_LIBAV) add_definitions(-DHAVE_FFMPEG)
else() else()
message(STATUS "libav/ffmpeg not found, disabling AVI frame dumps") message(STATUS "libav/ffmpeg not found, disabling AVI frame dumps")
endif() endif()

2
Source/Core/Core/State.cpp
View File

@ -191,7 +191,7 @@ static std::string DoState(PointerWrap& p)
Gecko::DoState(p); Gecko::DoState(p);
p.DoMarker("Gecko"); p.DoMarker("Gecko");
#if defined(HAVE_LIBAV) || defined(_WIN32) #if defined(HAVE_FFMPEG) || defined(_WIN32)
AVIDump::DoState(); AVIDump::DoState();
#endif #endif

4
Source/Core/DolphinWX/VideoConfigDiag.cpp
View File

@ -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 " "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 " "image will be scaled horizontally to preserve the vertical resolution.\n\nIf unsure, leave "
"this unchecked."); "this unchecked.");
#if defined(HAVE_LIBAV) || defined(_WIN32) #if defined(HAVE_FFMPEG) || defined(_WIN32)
static wxString use_ffv1_desc = static wxString use_ffv1_desc =
wxTRANSLATE("Encode frame dumps using the FFV1 codec.\n\nIf unsure, leave this unchecked."); wxTRANSLATE("Encode frame dumps using the FFV1 codec.\n\nIf unsure, leave this unchecked.");
#endif #endif
@ -894,7 +894,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string& title)
wxGetTranslation(dump_efb_desc), vconfig.bDumpEFBTarget)); wxGetTranslation(dump_efb_desc), vconfig.bDumpEFBTarget));
szr_utility->Add(CreateCheckBox(page_advanced, _("Free Look"), szr_utility->Add(CreateCheckBox(page_advanced, _("Free Look"),
wxGetTranslation(free_look_desc), vconfig.bFreeLook)); 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"), szr_utility->Add(CreateCheckBox(page_advanced, _("Frame Dumps Use FFV1"),
wxGetTranslation(use_ffv1_desc), vconfig.bUseFFV1)); wxGetTranslation(use_ffv1_desc), vconfig.bUseFFV1));
#endif #endif

2
Source/Core/VideoCommon/AVIDump.h
View File

@ -27,7 +27,7 @@ public:
static void Stop(); static void Stop();
static void DoState(); static void DoState();
#if defined(HAVE_LIBAV) || defined(_WIN32) #if defined(HAVE_FFMPEG) || defined(_WIN32)
static Frame FetchState(u64 ticks); static Frame FetchState(u64 ticks);
#else #else
static Frame FetchState(u64 ticks) { return {}; } static Frame FetchState(u64 ticks) { return {}; }

8
Source/Core/VideoCommon/RenderBase.cpp
View File

@ -774,7 +774,7 @@ bool Renderer::IsFrameDumping()
if (m_screenshot_request.IsSet()) if (m_screenshot_request.IsSet())
return true; return true;
#if defined(HAVE_LIBAV) || defined(_WIN32) #if defined(HAVE_FFMPEG) || defined(_WIN32)
if (SConfig::GetInstance().m_DumpFrames) if (SConfig::GetInstance().m_DumpFrames)
return true; return true;
#endif #endif
@ -828,7 +828,7 @@ void Renderer::RunFrameDumps()
bool frame_dump_started = false; bool frame_dump_started = false;
// If Dolphin was compiled without libav, we only support dumping to images. // 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) if (dump_to_avi)
{ {
WARN_LOG(VIDEO, "AVI frame dump requested, but Dolphin was compiled without libav. " 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) 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 std::string Renderer::GetFrameDumpNextImageFileName() const
{ {