From c3a1547d9ab79a30dd6aceaa8d2938df4a5c8973 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Mon, 23 Jan 2017 00:13:27 -0800 Subject: [PATCH] AVIDump: rename CreateFile -> CreateVideoFile (conflict with windows.h) --- Source/Core/VideoCommon/AVIDump.cpp | 4 ++-- Source/Core/VideoCommon/AVIDump.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/VideoCommon/AVIDump.cpp b/Source/Core/VideoCommon/AVIDump.cpp index ce1b377045..20494ba882 100644 --- a/Source/Core/VideoCommon/AVIDump.cpp +++ b/Source/Core/VideoCommon/AVIDump.cpp @@ -70,7 +70,7 @@ bool AVIDump::Start(int w, int h) s_last_pts = 0; InitAVCodec(); - bool success = CreateFile(); + bool success = CreateVideoFile(); if (!success) { CloseFile(); @@ -79,7 +79,7 @@ bool AVIDump::Start(int w, int h) return success; } -bool AVIDump::CreateFile() +bool AVIDump::CreateVideoFile() { AVCodec* codec = nullptr; diff --git a/Source/Core/VideoCommon/AVIDump.h b/Source/Core/VideoCommon/AVIDump.h index b9158774a3..91b2b1b668 100644 --- a/Source/Core/VideoCommon/AVIDump.h +++ b/Source/Core/VideoCommon/AVIDump.h @@ -9,7 +9,7 @@ class AVIDump { private: - static bool CreateFile(); + static bool CreateVideoFile(); static void CloseFile(); static void CheckResolution(int width, int height);