[x264-devel] commit: Encoder_reconfig: esa/ tesa can only be enabled if they were on to begin with ( Jason Garrett-Glaser )

[git version control]

x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Mon Nov  3 22:59:49 2008 -0800| [bc84e120f62b6fd3d6e08c816028c5f30aaea56b] | committer: Jason Garrett-Glaser 

Encoder_reconfig: esa/tesa can only be enabled if they were on to begin with
Bug report by kemuri-_9.

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

 encoder/encoder.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/encoder/encoder.c b/encoder/encoder.c
index b359e3f..6655c9b 100644
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -814,7 +814,6 @@ int x264_encoder_reconfig( x264_t *h, x264_param_t *param )
     COPY( analyse.intra );
     COPY( analyse.inter );
     COPY( analyse.i_direct_mv_pred );
-    COPY( analyse.i_me_method );
     COPY( analyse.i_me_range );
     COPY( analyse.i_noise_reduction );
     COPY( analyse.i_subpel_refine );
@@ -826,6 +825,8 @@ int x264_encoder_reconfig( x264_t *h, x264_param_t *param )
     COPY( analyse.f_psy_rd );
     COPY( analyse.f_psy_trellis );
     // 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 )
         COPY( analyse.b_transform_8x8 );
     if( h->frames.i_max_ref1 > 1 )