The Tor Browser / file comparison
comparison: media/libvpx/mingw.patch
media/libvpx/mingw.patch
- changeset 0
- 6474c204b198
equal
deleted
inserted
replaced
| -1:000000000000 | 0:731fe89c75a8 |
|---|---|
| 1 diff --git a/media/libvpx/vpx/src/svc_encodeframe.c b/media/libvpx/vpx/src/svc_encodeframe.c | |
| 2 index 57d21dc..2514ad3 100644 | |
| 3 --- a/media/libvpx/vpx/src/svc_encodeframe.c | |
| 4 +++ b/media/libvpx/vpx/src/svc_encodeframe.c | |
| 5 @@ -18,21 +18,23 @@ | |
| 6 #include <stdlib.h> | |
| 7 #include <string.h> | |
| 8 #define VPX_DISABLE_CTRL_TYPECHECKS 1 | |
| 9 #define VPX_CODEC_DISABLE_COMPAT 1 | |
| 10 #include "vpx/svc_context.h" | |
| 11 #include "vpx/vp8cx.h" | |
| 12 #include "vpx/vpx_encoder.h" | |
| 13 | |
| 14 -#if defined(__MINGW32__) && !defined(MINGW_HAS_SECURE_API) | |
| 15 +#ifdef __MINGW32__ | |
| 16 #define strtok_r strtok_s | |
| 17 +#ifndef MINGW_HAS_SECURE_API | |
| 18 // proto from /usr/x86_64-w64-mingw32/include/sec_api/string_s.h | |
| 19 _CRTIMP char *__cdecl strtok_s(char *str, const char *delim, char **context); | |
| 20 -#endif | |
| 21 +#endif /* MINGW_HAS_SECURE_API */ | |
| 22 +#endif /* __MINGW32__ */ | |
| 23 | |
| 24 #ifdef _MSC_VER | |
| 25 #define strdup _strdup | |
| 26 #define strtok_r strtok_s | |
| 27 #endif | |
| 28 | |
| 29 #define SVC_REFERENCE_FRAMES 8 | |
| 30 #define SUPERFRAME_SLOTS (8) |
