games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

It is possible to use ffmpeg with Visual Studio 2013 build by definining USE_FFMPEG macro.

Browse Source
This commit is contained in:
Michał W. Urbańczyk 2014-01-06 19:12:21 +00:00
parent 4674e8e3d8
commit 0b2ca4416a
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/CVideoHandler.cpp
View File

@ -21,7 +21,7 @@ static bool keyDown()
return false; return false;
} }
#ifdef _WIN32 #if defined(_WIN32) && (_MSC_VER < 1800 || !defined(USE_FFMPEG))
void checkForError(bool throwing = true) void checkForError(bool throwing = true)
{ {
@ -569,6 +569,14 @@ bool CVideoPlayer::playVideo(int x, int y, SDL_Surface *dst, bool stopOnKey)
#else #else
#ifdef _MSC_VER
#pragma comment(lib, "avcodec.lib")
#pragma comment(lib, "avutil.lib")
#pragma comment(lib, "avformat.lib")
#pragma comment(lib, "swscale.lib")
#endif // _MSC_VER
#ifndef DISABLE_VIDEO #ifndef DISABLE_VIDEO
// Define a set of functions to read data // Define a set of functions to read data

2
client/CVideoHandler.h
View File

@ -43,7 +43,7 @@ public:
}; };
#ifdef _WIN32 #if defined(_WIN32) && (_MSC_VER < 1800 || !defined(USE_FFMPEG))
#define WIN32_LEAN_AND_MEAN //excludes rarely used stuff from windows headers - delete this line if something is missing #define WIN32_LEAN_AND_MEAN //excludes rarely used stuff from windows headers - delete this line if something is missing
#include <windows.h> #include <windows.h>