From 4dfd401a63644f49e4283771c997eb04dd5efed2 Mon Sep 17 00:00:00 2001 From: Matthew Oliver Date: Sun, 2 Nov 2014 18:49:32 +1100 Subject: [PATCH] Update VS projects for recent merge. --- SMC/config.asm | 2 ++ SMC/config.h | 2 ++ SMC/libavformat.vcxproj | 3 +++ SMC/libavformat.vcxproj.filters | 3 +++ 4 files changed, 10 insertions(+) diff --git a/SMC/config.asm b/SMC/config.asm index 5935f99129..9ab8270524 100644 --- a/SMC/config.asm +++ b/SMC/config.asm @@ -164,6 +164,7 @@ %define HAVE_ATOMICS_SUNCC 0 %define HAVE_ATOMICS_WIN32 1 %define HAVE_ATOMIC_CAS_PTR 0 +%define HAVE_ATOMIC_COMPARE_EXCHANGE 0 %define HAVE_MACHINE_RW_BARRIER 0 %define HAVE_MEMORYBARRIER 1 %define HAVE_MM_EMPTY 1 @@ -1729,6 +1730,7 @@ %define CONFIG_WAV_MUXER 1 %define CONFIG_WEBM_MUXER 1 %define CONFIG_WEBM_DASH_MANIFEST_MUXER 1 +%define CONFIG_WEBP_MUXER 1 %define CONFIG_WEBVTT_MUXER 1 %define CONFIG_WTV_MUXER 1 %define CONFIG_WV_MUXER 1 diff --git a/SMC/config.h b/SMC/config.h index 9183bae87b..d77d81c79d 100644 --- a/SMC/config.h +++ b/SMC/config.h @@ -187,6 +187,7 @@ #define HAVE_ATOMICS_SUNCC 0 #define HAVE_ATOMICS_WIN32 1 #define HAVE_ATOMIC_CAS_PTR 0 +#define HAVE_ATOMIC_COMPARE_EXCHANGE 0 #define HAVE_MACHINE_RW_BARRIER 0 #define HAVE_MEMORYBARRIER 1 #define HAVE_MM_EMPTY 1 @@ -1772,6 +1773,7 @@ #define CONFIG_WAV_MUXER 1 #define CONFIG_WEBM_MUXER 1 #define CONFIG_WEBM_DASH_MANIFEST_MUXER 1 +#define CONFIG_WEBP_MUXER 1 #define CONFIG_WEBVTT_MUXER 1 #define CONFIG_WTV_MUXER 1 #define CONFIG_WV_MUXER 1 diff --git a/SMC/libavformat.vcxproj b/SMC/libavformat.vcxproj index b84ee6483c..ca4c387908 100644 --- a/SMC/libavformat.vcxproj +++ b/SMC/libavformat.vcxproj @@ -1091,6 +1091,9 @@ $(IntDir)\libavformat_wc3movie.obj + + $(IntDir)\libavformat_webpenc.obj + $(IntDir)\libavformat_webvttdec.obj diff --git a/SMC/libavformat.vcxproj.filters b/SMC/libavformat.vcxproj.filters index aab4609a0a..1315a69f92 100644 --- a/SMC/libavformat.vcxproj.filters +++ b/SMC/libavformat.vcxproj.filters @@ -1050,6 +1050,9 @@ Source Files\libavformat + + Source Files\libavformat + Source Files\libavformat -- GitLab