diff options
| author | Glenn Kasten <gkasten@google.com> | 2015-01-12 16:15:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-12 16:15:01 +0000 |
| commit | a18eb9ea913e2cd19df9fe0f1b2a667339006581 (patch) | |
| tree | 7d0c82041083a9f39525c98ac0c7fb6ccbd55756 /include/media | |
| parent | b60bf91d2b1b2e45166cbb1eff9499de8b1c1105 (diff) | |
| parent | 53dbe77b9f50cdd0de88b9d25dd643e90c8ba68b (diff) | |
| download | frameworks_av-a18eb9ea913e2cd19df9fe0f1b2a667339006581.zip frameworks_av-a18eb9ea913e2cd19df9fe0f1b2a667339006581.tar.gz frameworks_av-a18eb9ea913e2cd19df9fe0f1b2a667339006581.tar.bz2 | |
Merge "Move roundup from frameworks/av to system/media"
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/nbaio/NBLog.h | 2 | ||||
| -rw-r--r-- | include/media/nbaio/roundup.h | 31 |
2 files changed, 1 insertions, 32 deletions
diff --git a/include/media/nbaio/NBLog.h b/include/media/nbaio/NBLog.h index bcbbc04..1297b51 100644 --- a/include/media/nbaio/NBLog.h +++ b/include/media/nbaio/NBLog.h @@ -21,7 +21,7 @@ #include <binder/IMemory.h> #include <utils/Mutex.h> -#include <media/nbaio/roundup.h> +#include <audio_utils/roundup.h> namespace android { diff --git a/include/media/nbaio/roundup.h b/include/media/nbaio/roundup.h deleted file mode 100644 index 4c3cc25..0000000 --- a/include/media/nbaio/roundup.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ROUNDUP_H -#define ROUNDUP_H - -#ifdef __cplusplus -extern "C" { -#endif - -// Round up to the next highest power of 2 -unsigned roundup(unsigned v); - -#ifdef __cplusplus -} -#endif - -#endif // ROUNDUP_H |