diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-07-11 13:58:34 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-07-11 13:58:34 -0700 |
| commit | b55ecafda84ee233e2b2fe10c8cd0f31b710bc11 (patch) | |
| tree | e6dec7972d48c365654aaa9fc94425d7b24d98e5 | |
| parent | c4ad3273c7af292df189a095a64b9139cbed5285 (diff) | |
| parent | ac72ad071dc64f29795f9b5059bac16f2782fdaf (diff) | |
| download | libvpx-b55ecafda84ee233e2b2fe10c8cd0f31b710bc11.tar libvpx-b55ecafda84ee233e2b2fe10c8cd0f31b710bc11.tar.gz libvpx-b55ecafda84ee233e2b2fe10c8cd0f31b710bc11.tar.bz2 libvpx-b55ecafda84ee233e2b2fe10c8cd0f31b710bc11.zip | |
Merge "Making vp9_default_nmv_context static."
| -rw-r--r-- | vp9/common/vp9_entropymv.c | 4 | ||||
| -rw-r--r-- | 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 50e8463f6..ed6af665e 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 15f9ada43..0df92d031 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); |