Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-19 11:54:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed Windows compile of VOIP

Browse source
This commit is contained in:
thunder2 2017-03-06 21:46:42 +01:00
parent 0316c8c5ae
commit 6a6bcf73dc
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/VOIP/gui/VideoProcessor.cpp
View file

@ -38,6 +38,7 @@ extern "C" {
#endif #endif
#endif #endif
#ifndef MINGW
#if (LIBAVUTIL_VERSION_MAJOR == 54) && (LIBAVUTIL_VERSION_MINOR == 3) && (LIBAVUTIL_VERSION_MICRO == 0) #if (LIBAVUTIL_VERSION_MAJOR == 54) && (LIBAVUTIL_VERSION_MINOR == 3) && (LIBAVUTIL_VERSION_MICRO == 0)
//Ubuntu Vivid use other version of rational.h than GIT with LIBAVUTIL_VERSION_MICRO == 0 //Ubuntu Vivid use other version of rational.h than GIT with LIBAVUTIL_VERSION_MICRO == 0
#define VIVID_RATIONAL_H_VERSION 1 #define VIVID_RATIONAL_H_VERSION 1
@ -107,7 +108,7 @@ void av_frame_free(AVFrame **frame)
av_freep(frame); av_freep(frame);
} }
#endif #endif
#endif // MINGW
VideoProcessor::VideoProcessor() VideoProcessor::VideoProcessor()
:_encoded_frame_size(640,480) , vpMtx("VideoProcessor") :_encoded_frame_size(640,480) , vpMtx("VideoProcessor")