Make options SEI use weight* instead of wpred*

More intuitive and maps more reasonably to the CLI options.
Breaks statsfile backwards-compatibility.

diff --git a/common/common.c b/common/common.c
index 6471c07e1b26d83f3f3f976fe596ca4912e4a101..7bc6d6a2f309f732e22416159f1aa453ad21fbed 100644 (file)
--- a/common/common.c
+++ b/common/common.c
@@ -1225,11 +1225,11 @@ char *x264_param2string( x264_param_t *p, int b_res )
     s += sprintf( s, " bframes=%d", p->i_bframe );
     if( p->i_bframe )
     {
-        s += sprintf( s, " b_pyramid=%d b_adapt=%d b_bias=%d direct=%d wpredb=%d",
+        s += sprintf( s, " b_pyramid=%d b_adapt=%d b_bias=%d direct=%d weightb=%d",
                       p->i_bframe_pyramid, p->i_bframe_adaptive, p->i_bframe_bias,
                       p->analyse.i_direct_mv_pred, p->analyse.b_weighted_bipred );
     }
-    s += sprintf( s, " wpredp=%d", p->analyse.i_weighted_pred > 0 ? p->analyse.i_weighted_pred : 0 );
+    s += sprintf( s, " weightp=%d", p->analyse.i_weighted_pred > 0 ? p->analyse.i_weighted_pred : 0 );
 
     s += sprintf( s, " keyint=%d keyint_min=%d scenecut=%d intra_refresh=%d",
                   p->i_keyint_max, p->i_keyint_min, p->i_scenecut_threshold, p->b_intra_refresh );

diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
index f26855e3d65d31ed909e4399bf213f8aad6c9055..93e205abb077148a508506a1b40c9a5d821cf6b8 100644 (file)
--- a/encoder/ratecontrol.c
+++ b/encoder/ratecontrol.c
@@ -669,7 +669,7 @@ int x264_ratecontrol_new( x264_t *h )
                 return -1;
             }
 
-            CMP_OPT_FIRST_PASS( "wpredp", X264_MAX( 0, h->param.analyse.i_weighted_pred ) );
+            CMP_OPT_FIRST_PASS( "weightp", X264_MAX( 0, h->param.analyse.i_weighted_pred ) );
             CMP_OPT_FIRST_PASS( "bframes", h->param.i_bframe );
             CMP_OPT_FIRST_PASS( "b_pyramid", h->param.i_bframe_pyramid );
             CMP_OPT_FIRST_PASS( "intra_refresh", h->param.b_intra_refresh );