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

MSVC: define HAVE_FFMPEG

This commit is contained in:
Michael Maltese 2017-05-22 12:27:10 -07:00
parent 53acd25de4
commit 3ca03373ae
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,7 +191,7 @@ static std::string DoState(PointerWrap& p)
Gecko::DoState(p);
p.DoMarker("Gecko");
#if defined(HAVE_FFMPEG) || defined(_WIN32)
#if defined(HAVE_FFMPEG)
AVIDump::DoState();
#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 "
"image will be scaled horizontally to preserve the vertical resolution.\n\nIf unsure, leave "
"this unchecked.");
#if defined(HAVE_FFMPEG) || defined(_WIN32)
#if defined(HAVE_FFMPEG)
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_FFMPEG) || defined(_WIN32)
#if defined(HAVE_FFMPEG)
szr_utility->Add(CreateCheckBox(page_advanced, _("Frame Dumps Use FFV1"),
wxGetTranslation(use_ffv1_desc), vconfig.bUseFFV1));
#endif

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

@ -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 {}; }

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

@ -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
{

1
Source/VSProps/Base.props
View File

@ -50,6 +50,7 @@
<AdditionalIncludeDirectories>$(ExternalsDir)wxWidgets3\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ExternalsDir)zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_FFMPEG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>USE_UPNP;USE_USBDK;__LIBUSB__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>PSAPI_VERSION=1;_M_X86=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>