From ac72ad071dc64f29795f9b5059bac16f2782fdaf Mon Sep 17 00:00:00 2001
From: Dmitry Kovalev <dkovalev@google.com>
Date: Wed, 10 Jul 2013 17:44:45 -0700
Subject: [PATCH] Making vp9_default_nmv_context static.
Change-Id: Ia3d5bd45adf288de11ab59c4728266c93c17e275
---
vp9/common/vp9_entropymv.c | 4 ++--
vp9/common/vp9_entropymv.h | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/vp9/common/vp9_entropymv.c b/vp9/common/vp9_entropymv.c
index 50e8463f67..ed6af665e4 100644
--- a/vp9/common/vp9_entropymv.c
+++ b/vp9/common/vp9_entropymv.c
@@ -56,7 +56,7 @@ const vp9_tree_index vp9_mv_fp_tree [2 * 4 - 2] = {
};
struct vp9_token vp9_mv_fp_encodings[4];
-const nmv_context vp9_default_nmv_context = {
+static const nmv_context default_nmv_context = {
{32, 64, 96},
{
{ /* vert component */
@@ -360,5 +360,5 @@ void vp9_entropy_mv_init() {
}
void vp9_init_mv_probs(VP9_COMMON *cm) {
- vpx_memcpy(&cm->fc.nmvc, &vp9_default_nmv_context, sizeof(nmv_context));
+ cm->fc.nmvc = default_nmv_context;
}
diff --git a/vp9/common/vp9_entropymv.h b/vp9/common/vp9_entropymv.h
index 15f9ada439..0df92d0310 100644
--- a/vp9/common/vp9_entropymv.h
+++ b/vp9/common/vp9_entropymv.h
@@ -130,7 +130,6 @@ typedef struct {
void vp9_inc_mv(const MV *mv, const MV *ref, nmv_context_counts *mvctx,
int usehp);
-extern const nmv_context vp9_default_nmv_context;
void vp9_counts_process(nmv_context_counts *NMVcount, int usehp);
--
GitLab