commit 7ac3eb1bbc6d4cd6d9646a244d68ae148023e4e5
author Debargha Mukherjee <debargha@google.com> Wed Dec 12 10:26:50 2018 -0800
committer Debargha Mukherjee <debargha@google.com> Wed Dec 12 23:41:08 2018 +0000
tree e2b27e8dcae08724515db5a3b8242c535ecaf12d
parent 1b6e75c1720716843b8156fb42dcfc922695dbbb

Replace jnt_comp with dist_wtd_comp

Replace the term jnt_comp with dist_wtd_comp that
complies with the spec better.

Change-Id: If469fac50316fa5da1c92fcf438eed214a7d1cf5

apps/aomenc.c

diff --git a/apps/aomenc.c b/apps/aomenc.c
index 6cff587..184c6e3 100644
--- a/apps/aomenc.c
+++ b/apps/aomenc.c
@@ -445,7 +445,7 @@
     ARG_DEF(NULL, "enable-order-hint", 1,
             "Enable order hint "
             "(0: false, 1: true (default))");
-static const arg_def_t enable_jnt_comp =
+static const arg_def_t enable_dist_wtd_comp =
     ARG_DEF(NULL, "enable-dist-wtd-comp", 1,
             "Enable distance-weighted compound "
             "(0: false, 1: true (default))");
@@ -684,7 +684,7 @@
                                        &enable_restoration,
                                        &enable_dual_filter,
                                        &enable_order_hint,
-                                       &enable_jnt_comp,
+                                       &enable_dist_wtd_comp,
                                        &enable_masked_comp,
                                        &enable_interintra_comp,
                                        &enable_diff_wtd_comp,
@@ -754,7 +754,7 @@
                                         AV1E_SET_ENABLE_RESTORATION,
                                         AV1E_SET_ENABLE_DUAL_FILTER,
                                         AV1E_SET_ENABLE_ORDER_HINT,
-                                        AV1E_SET_ENABLE_JNT_COMP,
+                                        AV1E_SET_ENABLE_DIST_WTD_COMP,
                                         AV1E_SET_ENABLE_MASKED_COMP,
                                         AV1E_SET_ENABLE_INTERINTRA_COMP,
                                         AV1E_SET_ENABLE_DIFF_WTD_COMP,