summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-06-29 10:23:14 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-29 10:23:14 -0700
commit4ea52aea75c385e8d9de8cc04554aa5d93ca272b (patch)
tree683e921f8ad7eda3a374327003a67159fc3be069
parentfcc93ba6265f6cb1f193ac8b5827d37514dcf653 (diff)
parent0055e9e1c67e4614135da2cc0866caf3e7bfa3d6 (diff)
downloadframeworks_av-4ea52aea75c385e8d9de8cc04554aa5d93ca272b.zip
frameworks_av-4ea52aea75c385e8d9de8cc04554aa5d93ca272b.tar.gz
frameworks_av-4ea52aea75c385e8d9de8cc04554aa5d93ca272b.tar.bz2
Merge "Fix a format string that triggered a compile-time warning in OMXCodec.cpp"
-rw-r--r--media/libstagefright/OMXCodec.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index cd97302..e36b01f 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -1838,7 +1838,7 @@ status_t OMXCodec::allocateOutputBuffersFromNativeWindow() {
}
}
- LOGV("native_window_set_usage usage=0x%x", usage);
+ LOGV("native_window_set_usage usage=0x%lx", usage);
err = native_window_set_usage(
mNativeWindow.get(), usage | GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_EXTERNAL_DISP);
if (err != 0) {