summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2010-10-27 10:07:58 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-27 10:07:58 -0700
commit73b1089d9e626d53eb1a20cea800cfde65eb4299 (patch)
treebf6de48d7d83a6271384a77ab12d851c6985c10a
parent81bd788ecf1cd2f460c19f9a29464ee00f5ef8cf (diff)
parent883a922fbecc3a1efdee8329794073cc04520bcd (diff)
downloadframeworks_base-73b1089d9e626d53eb1a20cea800cfde65eb4299.zip
frameworks_base-73b1089d9e626d53eb1a20cea800cfde65eb4299.tar.gz
frameworks_base-73b1089d9e626d53eb1a20cea800cfde65eb4299.tar.bz2
Merge "Fix for simulator build break"
-rw-r--r--media/libstagefright/MediaExtractor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp
index ee03c52..965c370 100644
--- a/media/libstagefright/MediaExtractor.cpp
+++ b/media/libstagefright/MediaExtractor.cpp
@@ -65,7 +65,7 @@ sp<MediaExtractor> MediaExtractor::Create(
}
if (!strncmp(mime, "drm", 3)) {
- char *originalMime = strrchr(mime, '+') + 1;
+ const char *originalMime = strrchr(mime, '+') + 1;
if (!strncmp(mime, "drm+es_based", 12)) {
return new DRMExtractor(source, originalMime);