From 4b94efe6b574830314f424ce2fba1363601124fd Mon Sep 17 00:00:00 2001 From: AlexVinS Date: Wed, 11 Nov 2015 12:41:28 +0300 Subject: [PATCH] Hopefully proper fix for ffmpeg on MSVS --- client/CVideoHandler.cpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/client/CVideoHandler.cpp b/client/CVideoHandler.cpp index 88e320496..34586e29e 100644 --- a/client/CVideoHandler.cpp +++ b/client/CVideoHandler.cpp @@ -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)