Use the correct strtok under MSVC

Also change one malloc -> x264_malloc

diff --git a/common/osdep.h b/common/osdep.h
index 25bb1380a5c153412756d6f3fdfc11013317daa2..94d5c1ada480b7a8a6e2cce1888b339a75041b8f 100644 (file)
--- a/common/osdep.h
+++ b/common/osdep.h
@@ -47,6 +47,7 @@
 #define fseek _fseeki64
 #define ftell _ftelli64
 #define isfinite _finite
+#define strtok_r strtok_s
 #define _CRT_SECURE_NO_DEPRECATE
 #define X264_VERSION "" // no configure script for msvc
 #endif

diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
index c552aa79ab734796672b57f6b4cc03ab1fa372ff..2130071edc799c402433d19118ffa15a1b0a57a0 100644 (file)
--- a/encoder/ratecontrol.c
+++ b/encoder/ratecontrol.c
@@ -612,7 +612,7 @@ static int parse_zone( x264_t *h, x264_zone_t *z, char *p )
     p += len;
     if( !*p )
         return 0;
-    z->param = malloc( sizeof(x264_param_t) );
+    z->param = x264_malloc( sizeof(x264_param_t) );
     memcpy( z->param, &h->param, sizeof(x264_param_t) );
     while( (tok = strtok_r( p, ",", &saveptr )) )
     {