diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-28 07:56:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-28 07:56:52 +0200 |
| commit | 57ba7caa6dac9fb2119c86a94e9aeba0bc524065 (patch) | |
| tree | 4b2475726242fb4d686d9016ca3bade04309af74 /thirdparty | |
| parent | bec00110e0f9fa249a6148acc388aa4a84b04927 (diff) | |
| parent | b4b816c1226df7205c878b58e0a704102a149003 (diff) | |
Merge pull request #21511 from eska014/webm-nomt
Fix WebM and Theora video in HTML5 export
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/libvpx/vpx_config.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/thirdparty/libvpx/vpx_config.h b/thirdparty/libvpx/vpx_config.h index fb9e13c4ad..6caec50c81 100644 --- a/thirdparty/libvpx/vpx_config.h +++ b/thirdparty/libvpx/vpx_config.h @@ -67,6 +67,12 @@ #define CONFIG_BIG_ENDIAN 0 //TODO: Autodetect +#ifdef __EMSCRIPTEN__ +#define CONFIG_MULTITHREAD 0 +#else +#define CONFIG_MULTITHREAD 1 +#endif + #ifdef _WIN32 #define HAVE_PTHREAD_H 0 #define HAVE_UNISTD_H 0 @@ -95,7 +101,6 @@ #define CONFIG_RUNTIME_CPU_DETECT 1 #define CONFIG_POSTPROC 0 #define CONFIG_VP9_POSTPROC 0 -#define CONFIG_MULTITHREAD 1 #define CONFIG_INTERNAL_STATS 0 #define CONFIG_VP8_ENCODER 0 #define CONFIG_VP8_DECODER 1 |