diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-02-27 09:54:50 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-02-27 09:54:50 -0800 |
| commit | 516f228d23f1e50f2097321bd73c32fbf483fe7e (patch) | |
| tree | 572c671c9aafd4b628f79201fd40823a7c884706 /vp9 | |
| parent | 01906b53f87e765a659f3aabf6f0af76ea62e008 (diff) | |
| parent | 2c594a52751117cc1535fd042931b841cc71afb2 (diff) | |
| download | libvpx-516f228d23f1e50f2097321bd73c32fbf483fe7e.tar libvpx-516f228d23f1e50f2097321bd73c32fbf483fe7e.tar.gz libvpx-516f228d23f1e50f2097321bd73c32fbf483fe7e.tar.bz2 libvpx-516f228d23f1e50f2097321bd73c32fbf483fe7e.zip | |
Merge "Removing vp9_systemdependent.c."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/common/generic/vp9_systemdependent.c | 19 | ||||
| -rw-r--r-- | vp9/common/vp9_alloccommon.c | 2 | ||||
| -rw-r--r-- | vp9/common/vp9_systemdependent.h | 3 | ||||
| -rw-r--r-- | vp9/vp9_common.mk | 1 |
4 files changed, 1 insertions, 24 deletions
diff --git a/vp9/common/generic/vp9_systemdependent.c b/vp9/common/generic/vp9_systemdependent.c deleted file mode 100644 index 536febb65..000000000 --- a/vp9/common/generic/vp9_systemdependent.c +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2010 The WebM project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - - -#include "./vpx_config.h" -#include "./vp9_rtcd.h" -#include "vp9/common/vp9_onyxc_int.h" - -void vp9_machine_specific_config(VP9_COMMON *cm) { - (void)cm; - vp9_rtcd(); -} diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c index 6f771992b..ff4b7c1f9 100644 --- a/vp9/common/vp9_alloccommon.c +++ b/vp9/common/vp9_alloccommon.c @@ -201,7 +201,7 @@ int vp9_alloc_frame_buffers(VP9_COMMON *cm, int width, int height) { } void vp9_create_common(VP9_COMMON *cm) { - vp9_machine_specific_config(cm); + vp9_rtcd(); } void vp9_remove_common(VP9_COMMON *cm) { diff --git a/vp9/common/vp9_systemdependent.h b/vp9/common/vp9_systemdependent.h index 7455abce3..72edbca55 100644 --- a/vp9/common/vp9_systemdependent.h +++ b/vp9/common/vp9_systemdependent.h @@ -76,9 +76,6 @@ static INLINE int get_msb(unsigned int n) { } #endif -struct VP9Common; -void vp9_machine_specific_config(struct VP9Common *cm); - #ifdef __cplusplus } // extern "C" #endif diff --git a/vp9/vp9_common.mk b/vp9/vp9_common.mk index a448b3c52..9fb611504 100644 --- a/vp9/vp9_common.mk +++ b/vp9/vp9_common.mk @@ -25,7 +25,6 @@ VP9_COMMON_SRCS-yes += common/vp9_filter.c VP9_COMMON_SRCS-yes += common/vp9_filter.h VP9_COMMON_SRCS-yes += common/vp9_frame_buffers.c VP9_COMMON_SRCS-yes += common/vp9_frame_buffers.h -VP9_COMMON_SRCS-yes += common/generic/vp9_systemdependent.c VP9_COMMON_SRCS-yes += common/vp9_idct.c VP9_COMMON_SRCS-yes += common/vp9_alloccommon.h VP9_COMMON_SRCS-yes += common/vp9_blockd.h |