diff options
| author | Marco Nelissen <marcone@google.com> | 2014-05-21 16:08:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-21 16:08:05 +0000 |
| commit | 7ac0039611ea7ea18f9545f96a8f5cb31dcdebe5 (patch) | |
| tree | 853bd14855c46f874c7a6d5976b2fc3e1f2076f7 | |
| parent | 498692535c7ceecb3434a99c47e4c90ba3fdd90e (diff) | |
| parent | 0e03cf07deeda10c573657479591dcfbf1efca56 (diff) | |
| download | frameworks_av-7ac0039611ea7ea18f9545f96a8f5cb31dcdebe5.zip frameworks_av-7ac0039611ea7ea18f9545f96a8f5cb31dcdebe5.tar.gz frameworks_av-7ac0039611ea7ea18f9545f96a8f5cb31dcdebe5.tar.bz2 | |
Merge "Remove the last of the references."
| -rw-r--r-- | include/ndk/NdkMediaMuxer.h | 2 | ||||
| -rw-r--r-- | media/ndk/NdkMediaMuxer.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/ndk/NdkMediaMuxer.h b/include/ndk/NdkMediaMuxer.h index 1ddc51d..90d946c 100644 --- a/include/ndk/NdkMediaMuxer.h +++ b/include/ndk/NdkMediaMuxer.h @@ -110,7 +110,7 @@ media_status_t AMediaMuxer_stop(AMediaMuxer*); * by the encoder.) */ media_status_t AMediaMuxer_writeSampleData(AMediaMuxer *muxer, - size_t trackIdx, const uint8_t *data, const AMediaCodecBufferInfo &info); + size_t trackIdx, const uint8_t *data, const AMediaCodecBufferInfo *info); #ifdef __cplusplus } // extern "C" diff --git a/media/ndk/NdkMediaMuxer.cpp b/media/ndk/NdkMediaMuxer.cpp index 19b9fc4..50fc336 100644 --- a/media/ndk/NdkMediaMuxer.cpp +++ b/media/ndk/NdkMediaMuxer.cpp @@ -96,10 +96,10 @@ media_status_t AMediaMuxer_stop(AMediaMuxer *muxer) { EXPORT media_status_t AMediaMuxer_writeSampleData(AMediaMuxer *muxer, - size_t trackIdx, const uint8_t *data, const AMediaCodecBufferInfo &info) { - sp<ABuffer> buf = new ABuffer((void*)(data + info.offset), info.size); + size_t trackIdx, const uint8_t *data, const AMediaCodecBufferInfo *info) { + sp<ABuffer> buf = new ABuffer((void*)(data + info->offset), info->size); return translate_error( - muxer->mImpl->writeSampleData(buf, trackIdx, info.presentationTimeUs, info.flags)); + muxer->mImpl->writeSampleData(buf, trackIdx, info->presentationTimeUs, info->flags)); } |