media/libvpx/mingw.patch@ac0c01689b40 (annotated)
media/libvpx/mingw.patch
Thu, 15 Jan 2015 15:59:08 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 15 Jan 2015 15:59:08 +0100
- branch
- TOR_BUG_9701
- changeset 10
- ac0c01689b40
- permissions
- -rw-r--r--
Implement a real Private Browsing Mode condition by changing the API/ABI;
This solves Tor bug #9701, complying with disk avoidance documented in
https://www.torproject.org/projects/torbrowser/design/#disk-avoidance.
| michael@0 | 1 | diff --git a/media/libvpx/vpx/src/svc_encodeframe.c b/media/libvpx/vpx/src/svc_encodeframe.c |
| michael@0 | 2 | index 57d21dc..2514ad3 100644 |
| michael@0 | 3 | --- a/media/libvpx/vpx/src/svc_encodeframe.c |
| michael@0 | 4 | +++ b/media/libvpx/vpx/src/svc_encodeframe.c |
| michael@0 | 5 | @@ -18,21 +18,23 @@ |
| michael@0 | 6 | #include <stdlib.h> |
| michael@0 | 7 | #include <string.h> |
| michael@0 | 8 | #define VPX_DISABLE_CTRL_TYPECHECKS 1 |
| michael@0 | 9 | #define VPX_CODEC_DISABLE_COMPAT 1 |
| michael@0 | 10 | #include "vpx/svc_context.h" |
| michael@0 | 11 | #include "vpx/vp8cx.h" |
| michael@0 | 12 | #include "vpx/vpx_encoder.h" |
| michael@0 | 13 | |
| michael@0 | 14 | -#if defined(__MINGW32__) && !defined(MINGW_HAS_SECURE_API) |
| michael@0 | 15 | +#ifdef __MINGW32__ |
| michael@0 | 16 | #define strtok_r strtok_s |
| michael@0 | 17 | +#ifndef MINGW_HAS_SECURE_API |
| michael@0 | 18 | // proto from /usr/x86_64-w64-mingw32/include/sec_api/string_s.h |
| michael@0 | 19 | _CRTIMP char *__cdecl strtok_s(char *str, const char *delim, char **context); |
| michael@0 | 20 | -#endif |
| michael@0 | 21 | +#endif /* MINGW_HAS_SECURE_API */ |
| michael@0 | 22 | +#endif /* __MINGW32__ */ |
| michael@0 | 23 | |
| michael@0 | 24 | #ifdef _MSC_VER |
| michael@0 | 25 | #define strdup _strdup |
| michael@0 | 26 | #define strtok_r strtok_s |
| michael@0 | 27 | #endif |
| michael@0 | 28 | |
| michael@0 | 29 | #define SVC_REFERENCE_FRAMES 8 |
| michael@0 | 30 | #define SUPERFRAME_SLOTS (8) |
