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

Hopefully proper fix for ffmpeg on MSVS

Browse Source
This commit is contained in:
AlexVinS 2015-11-11 12:41:28 +03:00
parent 5fadb239f2
commit 4b94efe6b5
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client/CVideoHandler.cpp
View File

@ -151,15 +151,12 @@ bool CVideoPlayer::open(std::string fname, bool loop, bool useOverlay, bool scal
}
// Allocate video frame
#ifdef _MSC_VER
#if LIBAVUTIL_VERSION_MAJOR > 51
frame = av_frame_alloc();
#else
#if LIBAVUTIL_VERSION_MAJOR > 52
frame = av_alloc_frame();
#else
frame = avcodec_alloc_frame();
#endif
#endif
//setup scaling
@ -396,15 +393,12 @@ void CVideoPlayer::close()
if (frame)
{
#ifndef _MSC_VER
#if LIBAVUTIL_VERSION_MAJOR > 52
av_frame_free(frame);
#endif
#if LIBAVUTIL_VERSION_MAJOR > 51
av_frame_free(&frame);//will be set to null
#else
av_free(frame);
frame = nullptr;
#endif
frame = nullptr;
}
if (codec)