summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MPEG4Writer.cpp
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-04-17 15:34:18 -0700
committerLajos Molnar <lajos@google.com>2015-04-17 15:34:56 -0700
commit3b0da19c78f6a61ed343a07f2448b94faafe4c02 (patch)
tree866dff52ae9c050d2b8558c021164803ae5a3d3b /media/libstagefright/MPEG4Writer.cpp
parentee4e1b1a63758941460ae79a064249d3a5189443 (diff)
downloadframeworks_av-3b0da19c78f6a61ed343a07f2448b94faafe4c02.zip
frameworks_av-3b0da19c78f6a61ed343a07f2448b94faafe4c02.tar.gz
frameworks_av-3b0da19c78f6a61ed343a07f2448b94faafe4c02.tar.bz2
stagefright: make more warnings errors
Change-Id: I9b1ad60fbfb866dbf9c00843e06553c3eb25c113
Diffstat (limited to 'media/libstagefright/MPEG4Writer.cpp')
-rw-r--r--media/libstagefright/MPEG4Writer.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index 003b09a..beb12ec 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -63,9 +63,11 @@ static const uint8_t kNalUnitTypeSeqParamSet = 0x07;
static const uint8_t kNalUnitTypePicParamSet = 0x08;
static const int64_t kInitialDelayTimeUs = 700000LL;
-static const char kMetaKey_Model[] = "com.android.model";
static const char kMetaKey_Version[] = "com.android.version";
+#ifdef SHOW_MODEL_BUILD
+static const char kMetaKey_Model[] = "com.android.model";
static const char kMetaKey_Build[] = "com.android.build";
+#endif
static const char kMetaKey_CaptureFps[] = "com.android.capture.fps";
/* uncomment to include model and build in meta */