summaryrefslogtreecommitdiffstats
path: root/media/libnbaio
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-02-04 22:06:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-02-04 22:06:20 +0000
commitb28c68321689fc2bed5d5c5935d7cadac9ca0ff9 (patch)
tree87274623591e5efbb2e88730380d2f5ed6635a45 /media/libnbaio
parent56305028e6b6d099eb9a1ebfc3005993f42c897c (diff)
parent51d53cd993043d9286e12cba884e6ee4d10b5fac (diff)
downloadframeworks_av-b28c68321689fc2bed5d5c5935d7cadac9ca0ff9.zip
frameworks_av-b28c68321689fc2bed5d5c5935d7cadac9ca0ff9.tar.gz
frameworks_av-b28c68321689fc2bed5d5c5935d7cadac9ca0ff9.tar.bz2
Merge "Change Format_Invalid from enum to global const"
Diffstat (limited to 'media/libnbaio')
-rw-r--r--media/libnbaio/NBAIO.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libnbaio/NBAIO.cpp b/media/libnbaio/NBAIO.cpp
index 290604e..8a8155d 100644
--- a/media/libnbaio/NBAIO.cpp
+++ b/media/libnbaio/NBAIO.cpp
@@ -33,6 +33,8 @@ size_t Format_frameBitShift(const NBAIO_Format& format)
return Format_channelCount(format);
}
+const NBAIO_Format Format_Invalid = { 0 };
+
enum {
Format_SR_8000,
Format_SR_11025,