diff options
author | James Dong <jdong@google.com> | 2011-05-17 22:39:06 -0700 |
---|---|---|
committer | James Dong <jdong@google.com> | 2011-05-17 22:39:06 -0700 |
commit | 2cf9c5073ca3342ee52673ad68763fadd2c2be79 (patch) | |
tree | 682303e9249df40e9f77ea4ec2e65a75aa691567 /media | |
parent | 07ec01904613a0bac32caaa8444b4690998faed7 (diff) | |
download | frameworks_av-2cf9c5073ca3342ee52673ad68763fadd2c2be79.zip frameworks_av-2cf9c5073ca3342ee52673ad68763fadd2c2be79.tar.gz frameworks_av-2cf9c5073ca3342ee52673ad68763fadd2c2be79.tar.bz2 |
Revert "Add const to the finders method in MetaData.cpp"
This reverts commit 78fed171d9d62b25aa846d7373a7040e3fd2241e.
Conflicts:
include/media/stagefright/MPEG4Writer.h
Change-Id: Ie6f497f67a473ad95b50bb949c1aa49e1804bac3
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/MPEG4Writer.cpp | 2 | ||||
-rw-r--r-- | media/libstagefright/MetaData.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp index 988392e..f6a8b17 100644 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp @@ -744,7 +744,7 @@ void MPEG4Writer::writeMoovBox(int64_t durationUs) { endBox(); // moov } -void MPEG4Writer::writeFtypBox(const MetaData *param) { +void MPEG4Writer::writeFtypBox(MetaData *param) { beginBox("ftyp"); int32_t fileType; diff --git a/media/libstagefright/MetaData.cpp b/media/libstagefright/MetaData.cpp index aac94a6..884f3b4 100644 --- a/media/libstagefright/MetaData.cpp +++ b/media/libstagefright/MetaData.cpp @@ -83,7 +83,7 @@ bool MetaData::setRect( return setData(key, TYPE_RECT, &r, sizeof(r)); } -bool MetaData::findCString(uint32_t key, const char **value) const { +bool MetaData::findCString(uint32_t key, const char **value) { uint32_t type; const void *data; size_t size; @@ -96,7 +96,7 @@ bool MetaData::findCString(uint32_t key, const char **value) const { return true; } -bool MetaData::findInt32(uint32_t key, int32_t *value) const { +bool MetaData::findInt32(uint32_t key, int32_t *value) { uint32_t type; const void *data; size_t size; @@ -111,7 +111,7 @@ bool MetaData::findInt32(uint32_t key, int32_t *value) const { return true; } -bool MetaData::findInt64(uint32_t key, int64_t *value) const { +bool MetaData::findInt64(uint32_t key, int64_t *value) { uint32_t type; const void *data; size_t size; @@ -126,7 +126,7 @@ bool MetaData::findInt64(uint32_t key, int64_t *value) const { return true; } -bool MetaData::findFloat(uint32_t key, float *value) const { +bool MetaData::findFloat(uint32_t key, float *value) { uint32_t type; const void *data; size_t size; @@ -141,7 +141,7 @@ bool MetaData::findFloat(uint32_t key, float *value) const { return true; } -bool MetaData::findPointer(uint32_t key, void **value) const { +bool MetaData::findPointer(uint32_t key, void **value) { uint32_t type; const void *data; size_t size; @@ -159,7 +159,7 @@ bool MetaData::findPointer(uint32_t key, void **value) const { bool MetaData::findRect( uint32_t key, int32_t *left, int32_t *top, - int32_t *right, int32_t *bottom) const { + int32_t *right, int32_t *bottom) { uint32_t type; const void *data; size_t size; |