diff options
| author | Ying Wang <wangying@google.com> | 2015-04-21 05:17:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-21 05:17:09 +0000 |
| commit | 467753a4b7bd45a99f75dbc9b67daea9f2c1ba49 (patch) | |
| tree | 2ad28f18816c7594047661e648716650edf05297 /media | |
| parent | ea44f41bb142555e747cc11382296e94af99d312 (diff) | |
| parent | 5fde15db465775d5c607cf069752e2e075f8fc6d (diff) | |
| download | frameworks_av-467753a4b7bd45a99f75dbc9b67daea9f2c1ba49.zip frameworks_av-467753a4b7bd45a99f75dbc9b67daea9f2c1ba49.tar.gz frameworks_av-467753a4b7bd45a99f75dbc9b67daea9f2c1ba49.tar.bz2 | |
Merge "Fix mips build."
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 2 | ||||
| -rw-r--r-- | media/libmediaplayerservice/MetadataRetrieverClient.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 87003c5..3bc763f 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -746,7 +746,7 @@ status_t MediaPlayerService::Client::setDataSource(int fd, int64_t offset, int64 return UNKNOWN_ERROR; } - ALOGV("st_dev = %llu", sb.st_dev); + ALOGV("st_dev = %llu", static_cast<uint64_t>(sb.st_dev)); ALOGV("st_mode = %u", sb.st_mode); ALOGV("st_uid = %lu", static_cast<unsigned long>(sb.st_uid)); ALOGV("st_gid = %lu", static_cast<unsigned long>(sb.st_gid)); diff --git a/media/libmediaplayerservice/MetadataRetrieverClient.cpp b/media/libmediaplayerservice/MetadataRetrieverClient.cpp index 6ef4c1f..9a37302 100644 --- a/media/libmediaplayerservice/MetadataRetrieverClient.cpp +++ b/media/libmediaplayerservice/MetadataRetrieverClient.cpp @@ -141,7 +141,7 @@ status_t MetadataRetrieverClient::setDataSource(int fd, int64_t offset, int64_t ALOGE("fstat(%d) failed: %d, %s", fd, ret, strerror(errno)); return BAD_VALUE; } - ALOGV("st_dev = %llu", sb.st_dev); + ALOGV("st_dev = %llu", static_cast<uint64_t>(sb.st_dev)); ALOGV("st_mode = %u", sb.st_mode); ALOGV("st_uid = %lu", static_cast<unsigned long>(sb.st_uid)); ALOGV("st_gid = %lu", static_cast<unsigned long>(sb.st_gid)); |