Fix crash in --me esa/tesa introduced in r1058

Also suppress the last mingw warning message

diff --git a/common/common.c b/common/common.c
index 5e08c68882509ad686dcba52795c85480e38ca85..6669cae86334e31dae6d1b6e90fc9dbdcf6303b0 100644 (file)
--- a/common/common.c
+++ b/common/common.c
@@ -247,7 +247,7 @@ int x264_param_parse( x264_param_t *p, const char *name, const char *value )
         if( b_error )
         {
             char *buf = strdup(value);
-            char *tok, *saveptr, *init;
+            char *tok, UNUSED *saveptr, *init;
             b_error = 0;
             p->cpu = 0;
             for( init=buf; (tok=strtok_r(init, ",", &saveptr)); init=NULL )

diff --git a/common/mc.c b/common/mc.c
index 7422ba4e8930af8e10327307c3ef09f719d0622b..331e6265d1caab27bb94ba90d182f50a8cb54f14 100644 (file)
--- a/common/mc.c
+++ b/common/mc.c
@@ -439,7 +439,7 @@ void x264_frame_filter( x264_t *h, x264_frame_t *frame, int mb_y, int b_end )
             start = -PADV;
         }
         if( b_end )
-            height += PADV-8;
+            height += PADV-9;
         for( y = start; y < height; y++ )
         {
             uint8_t  *pix  = frame->plane[0] + y * stride - PADH;