Commit 7fbc84b8 authored by Anton Mitrofanov's avatar Anton Mitrofanov Committed by Fiona Glaser

Fix various silly errors in the previous patches

parent 1c14dca5
......@@ -346,6 +346,7 @@ static int x264_param_apply_tune( x264_param_t *param, const char *tune )
else
{
fprintf( stderr, "x264 [error]: invalid tune '%s'\n", s );
x264_free( tmp );
return -1;
}
if( 0 )
......@@ -355,6 +356,7 @@ static int x264_param_apply_tune( x264_param_t *param, const char *tune )
}
s = strtok( NULL, ",./-+" );
}
x264_free( tmp );
return 0;
}
......
......@@ -202,6 +202,7 @@ void x264_frame_delete( x264_frame_t *frame )
x264_free( frame->i_row_bits );
x264_free( frame->i_row_qp );
x264_free( frame->mb_type );
x264_free( frame->mb_partition );
x264_free( frame->mv[0] );
x264_free( frame->mv[1] );
x264_free( frame->ref[0] );
......
......@@ -740,7 +740,7 @@ cglobal x264_memzero_aligned_%1, 2,2
mova [r0 + r1 + i], m0
%assign i i+mmsize
%endrep
add r1d, mmsize*8
add r1, mmsize*8
jl .loop
REP_RET
%endmacro
......
......@@ -793,7 +793,7 @@ static int Parse( int argc, char **argv, x264_param_t *param, cli_opt_t *opt )
const char *demuxer = demuxer_names[0];
char *output_filename = NULL;
const char *muxer = muxer_names[0];
x264_param_t defaults = *param;
x264_param_t defaults;
char *profile = NULL;
int b_thread_input = 0;
int b_turbo = 1;
......@@ -805,6 +805,8 @@ static int Parse( int argc, char **argv, x264_param_t *param, cli_opt_t *opt )
char *preset = NULL;
char *tune = NULL;
x264_param_default( &defaults );
memset( opt, 0, sizeof(cli_opt_t) );
memset( &input_opt, 0, sizeof(cli_input_opt_t) );
opt->b_progress = 1;
......
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