Commit 16e3ef85 authored by Fiona Glaser's avatar Fiona Glaser
Browse files

Encoder_reconfig: esa/tesa can only be enabled if they were on to begin with

Bug report by kemuri-_9.
parent ca49901f
...@@ -814,7 +814,6 @@ int x264_encoder_reconfig( x264_t *h, x264_param_t *param ) ...@@ -814,7 +814,6 @@ int x264_encoder_reconfig( x264_t *h, x264_param_t *param )
COPY( analyse.intra ); COPY( analyse.intra );
COPY( analyse.inter ); COPY( analyse.inter );
COPY( analyse.i_direct_mv_pred ); COPY( analyse.i_direct_mv_pred );
COPY( analyse.i_me_method );
COPY( analyse.i_me_range ); COPY( analyse.i_me_range );
COPY( analyse.i_noise_reduction ); COPY( analyse.i_noise_reduction );
COPY( analyse.i_subpel_refine ); COPY( analyse.i_subpel_refine );
...@@ -826,6 +825,8 @@ int x264_encoder_reconfig( x264_t *h, x264_param_t *param ) ...@@ -826,6 +825,8 @@ int x264_encoder_reconfig( x264_t *h, x264_param_t *param )
COPY( analyse.f_psy_rd ); COPY( analyse.f_psy_rd );
COPY( analyse.f_psy_trellis ); COPY( analyse.f_psy_trellis );
// can only twiddle these if they were enabled to begin with: // can only twiddle these if they were enabled to begin with:
if( h->param.analyse.i_me_method >= X264_ME_ESA || param->analyse.i_me_method < X264_ME_ESA )
COPY( analyse.i_me_method );
if( h->pps->b_transform_8x8_mode ) if( h->pps->b_transform_8x8_mode )
COPY( analyse.b_transform_8x8 ); COPY( analyse.b_transform_8x8 );
if( h->frames.i_max_ref1 > 1 ) if( h->frames.i_max_ref1 > 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