mirror of
https://git.freebsd.org/ports.git
synced 2025-06-07 22:00:31 -04:00
31204b2750
Changes: https://retroshareteam.wordpress.com/2016/02/07/release-notes-for-final-0-6-0/ - distsite moved to github PR: 207550 Submitted by: w.schwarzenfeld@aon.at, Yuri Victorovich <yuri@rawbw.com>, peter@netkey.at (maintainer) Reviewed by: feld
21 lines
708 B
C++
21 lines
708 B
C++
--- plugins/VOIP/gui/VideoProcessor.cpp.orig 2016-02-05 19:04:46 UTC
|
|
+++ plugins/VOIP/gui/VideoProcessor.cpp
|
|
@@ -3,7 +3,7 @@
|
|
#ifdef __MACH__
|
|
#include <malloc/malloc.h>
|
|
#else
|
|
-#include <malloc.h>
|
|
+#include <stdlib.h>
|
|
#endif
|
|
|
|
#include <QByteArray>
|
|
@@ -737,7 +737,8 @@ bool FFmpegVideo::decodeData(const RsVOI
|
|
//Mac OS X appears to be 16-byte mem aligned.
|
|
unsigned char *tmp = (unsigned char*)malloc(s + AV_INPUT_BUFFER_PADDING_SIZE) ;
|
|
#else //MAC
|
|
- unsigned char *tmp = (unsigned char*)memalign(16, s + AV_INPUT_BUFFER_PADDING_SIZE) ;
|
|
+ unsigned char *tmp ;
|
|
+ int unused_error = posix_memalign((void **)tmp, 16, s + AV_INPUT_BUFFER_PADDING_SIZE) ;
|
|
#endif //MAC
|
|
#endif //MINGW
|
|
if (tmp == NULL) {
|