diff options
author | Andreas Huber <andih@google.com> | 2011-06-29 10:23:14 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-29 10:23:14 -0700 |
commit | 2d700947dbdf46b030ec911d1347680906783e22 (patch) | |
tree | 099c7cc1ef9fdcc0f779ceec6c93a4911d2635c2 /media | |
parent | a7265fe0623f541e6100e06efc7358ff036576b3 (diff) | |
parent | 9fb64a250c5ea317490a569f5ce881c533642228 (diff) | |
download | frameworks_base-2d700947dbdf46b030ec911d1347680906783e22.zip frameworks_base-2d700947dbdf46b030ec911d1347680906783e22.tar.gz frameworks_base-2d700947dbdf46b030ec911d1347680906783e22.tar.bz2 |
Merge "Fix a format string that triggered a compile-time warning in OMXCodec.cpp"
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/OMXCodec.cpp | 2 |
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) { |