[x264-devel] commit: Fix crash in --me esa/tesa introduced in r1058 (Loren Merritt )

[git version control]

x264 | branch: master | Loren Merritt <pengvado at akuvian.org> | Wed Dec 24 22:58:17 2008 -0500| [839cd8cf33492213f7878bf14c26b387b6599abd] | committer: Jason Garrett-Glaser 

Fix crash in --me esa/tesa introduced in r1058
Also suppress the last mingw warning message

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=839cd8cf33492213f7878bf14c26b387b6599abd
---

 common/common.c |    2 +-
 common/mc.c     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/common.c b/common/common.c
index 5e08c68..6669cae 100644
--- 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 7422ba4..331e626 100644
--- 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;