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

Fixed ffmpeg compilation on Visual Studio.

Browse Source
This commit is contained in:
DjWarmonger 2015-11-11 09:41:28 +01:00
parent 96897acc46
commit d95a999e23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/CVideoHandler.cpp
View File

@ -151,10 +151,14 @@ bool CVideoPlayer::open(std::string fname, bool loop, bool useOverlay, bool scal
}
// Allocate video frame
#ifdef _MSC_VER
frame = av_frame_alloc();
#else
#if LIBAVUTIL_VERSION_MAJOR > 52
frame = av_alloc_frame();
#else
frame = avcodec_alloc_frame();
#endif
#endif
//setup scaling
@ -392,11 +396,14 @@ void CVideoPlayer::close()
if (frame)
{
#ifndef _MSC_VER
#if LIBAVUTIL_VERSION_MAJOR > 52
av_frame_free(frame);
#endif
#else
av_free(frame);
#endif
frame = nullptr;
}