summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/matroska
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-11-26 22:02:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-26 22:02:28 +0000
commite5ba80c5c802ddad57e1132675c32b479c16758a (patch)
tree839461daae7b2e8b5dcb8acdf33a7367aa1a378c /media/libstagefright/matroska
parente464018a7fdacdc3bef3058620eb09ec60d3cccf (diff)
parent1a9c3954a20800dda3d6d18048c7f0edc8c53e6a (diff)
downloadframeworks_av-e5ba80c5c802ddad57e1132675c32b479c16758a.zip
frameworks_av-e5ba80c5c802ddad57e1132675c32b479c16758a.tar.gz
frameworks_av-e5ba80c5c802ddad57e1132675c32b479c16758a.tar.bz2
am 1a9c3954: Merge "Stagefright: Fix unused variables, functions, values"
* commit '1a9c3954a20800dda3d6d18048c7f0edc8c53e6a': Stagefright: Fix unused variables, functions, values
Diffstat (limited to 'media/libstagefright/matroska')
-rw-r--r--media/libstagefright/matroska/MatroskaExtractor.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/media/libstagefright/matroska/MatroskaExtractor.cpp b/media/libstagefright/matroska/MatroskaExtractor.cpp
index 2587ec7..89ffa0c 100644
--- a/media/libstagefright/matroska/MatroskaExtractor.cpp
+++ b/media/libstagefright/matroska/MatroskaExtractor.cpp
@@ -499,17 +499,6 @@ static unsigned U24_AT(const uint8_t *ptr) {
return ptr[0] << 16 | ptr[1] << 8 | ptr[2];
}
-static size_t clz(uint8_t x) {
- size_t numLeadingZeroes = 0;
-
- while (!(x & 0x80)) {
- ++numLeadingZeroes;
- x = x << 1;
- }
-
- return numLeadingZeroes;
-}
-
void MatroskaSource::clearPendingFrames() {
while (!mPendingFrames.empty()) {
MediaBuffer *frame = *mPendingFrames.begin();