Commit 0ad4944b authored by Loren Merritt's avatar Loren Merritt Committed by Fiona Glaser

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

Also suppress the last mingw warning message
parent 9fe6e5e6
......@@ -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 )
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment