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 /include | |
| 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 'include')
| -rw-r--r-- | include/media/stagefright/MPEG4Writer.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/MetaData.h | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/media/stagefright/MPEG4Writer.h b/include/media/stagefright/MPEG4Writer.h index 1764306..904ce2a 100644 --- a/include/media/stagefright/MPEG4Writer.h +++ b/include/media/stagefright/MPEG4Writer.h @@ -176,7 +176,7 @@ private: void writeCompositionMatrix(int32_t degrees); void writeMvhdBox(int64_t durationUs); void writeMoovBox(int64_t durationUs); - void writeFtypBox(const MetaData *param); + void writeFtypBox(MetaData *param); void writeUdtaBox(); void writeGeoDataBox(); void writeLatitude(int degreex10000); diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index a300f0e..4044c5d 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -154,16 +154,16 @@ public: int32_t left, int32_t top, int32_t right, int32_t bottom); - bool findCString(uint32_t key, const char **value) const; - bool findInt32(uint32_t key, int32_t *value) const; - bool findInt64(uint32_t key, int64_t *value) const; - bool findFloat(uint32_t key, float *value) const; - bool findPointer(uint32_t key, void **value) const; + bool findCString(uint32_t key, const char **value); + bool findInt32(uint32_t key, int32_t *value); + bool findInt64(uint32_t key, int64_t *value); + bool findFloat(uint32_t key, float *value); + bool findPointer(uint32_t key, void **value); bool findRect( uint32_t key, int32_t *left, int32_t *top, - int32_t *right, int32_t *bottom) const; + int32_t *right, int32_t *bottom); bool setData(uint32_t key, uint32_t type, const void *data, size_t size); |