diff options
Diffstat (limited to 'build_files/build_environment/patches/ffmpeg.diff')
| -rw-r--r-- | build_files/build_environment/patches/ffmpeg.diff | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/build_files/build_environment/patches/ffmpeg.diff b/build_files/build_environment/patches/ffmpeg.diff index 75fc6490031..6e925399c95 100644 --- a/build_files/build_environment/patches/ffmpeg.diff +++ b/build_files/build_environment/patches/ffmpeg.diff @@ -1,32 +1,11 @@ ---- libavutil/common.h 2016-02-14 19:29:42 -0700 -+++ libavutil/common.h 2016-03-30 09:50:29 -0600 -@@ -99,6 +99,11 @@ - #define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0) - #define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0])) - -+//msvc helper -+#ifdef _MSC_VER -+#define inline __inline -+#endif -+ - /* misc math functions */ - - #ifdef HAVE_AV_CONFIG_H --- configure 2016-11-26 03:12:05.000000000 +0100 +++ configure 2017-04-05 03:24:35.000000000 +0200 -@@ -1899,7 +1899,6 @@ - access - aligned_malloc - arc4random -- clock_gettime - closesocket - CommandLineToArgvW - CoTaskMemFree -@@ -5494,7 +5493,6 @@ +@@ -5494,7 +5493,5 @@ check_func access check_func_headers stdlib.h arc4random --check_func_headers time.h clock_gettime || { check_func_headers time.h clock_gettime -lrt && add_extralibs -lrt && LIBRT="-lrt"; } +-check_func_headers time.h clock_gettime || +- { check_lib clock_gettime time.h clock_gettime -lrt && LIBRT="-lrt"; } check_func fcntl check_func fork check_func gethrtime |