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

av1/common/reconinter.h

diff --git a/av1/common/reconinter.h b/av1/common/reconinter.h
index b773679..fb825e0 100644
--- a/av1/common/reconinter.h
+++ b/av1/common/reconinter.h
@@ -351,9 +351,11 @@
                             const uint8_t *inter_pred, int inter_stride,
                             const uint8_t *intra_pred, int intra_stride);
 
-void av1_jnt_comp_weight_assign(const AV1_COMMON *cm, const MB_MODE_INFO *mbmi,
-                                int order_idx, int *fwd_offset, int *bck_offset,
-                                int *use_jnt_comp_avg, int is_compound);
+void av1_dist_wtd_comp_weight_assign(const AV1_COMMON *cm,
+                                     const MB_MODE_INFO *mbmi, int order_idx,
+                                     int *fwd_offset, int *bck_offset,
+                                     int *use_dist_wtd_comp_avg,
+                                     int is_compound);
 int av1_allow_warp(const MB_MODE_INFO *const mbmi,
                    const WarpTypesAllowed *const warp_types,
                    const WarpedMotionParams *const gm_params,