diff options
| author | Marco Nelissen <marcone@google.com> | 2014-05-29 15:35:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-29 15:35:08 +0000 |
| commit | 798ce934571bc7eb5715bf1c03cbe5436a1220e3 (patch) | |
| tree | aafe457a33a5b221a28a3f00668ac1ed753e12d1 | |
| parent | 7f692022a6e91723eb84a41f14b64fa565274424 (diff) | |
| parent | eb4860c305def68c5965474bb43c67c2c9d49bbb (diff) | |
| download | frameworks_av-798ce934571bc7eb5715bf1c03cbe5436a1220e3.zip frameworks_av-798ce934571bc7eb5715bf1c03cbe5436a1220e3.tar.gz frameworks_av-798ce934571bc7eb5715bf1c03cbe5436a1220e3.tar.bz2 | |
Merge "getSampletime -> getSampleTime"
| -rw-r--r-- | include/ndk/NdkMediaExtractor.h | 2 | ||||
| -rw-r--r-- | media/ndk/NdkMediaExtractor.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/ndk/NdkMediaExtractor.h b/include/ndk/NdkMediaExtractor.h index 5a319d7..7a4e702 100644 --- a/include/ndk/NdkMediaExtractor.h +++ b/include/ndk/NdkMediaExtractor.h @@ -106,7 +106,7 @@ int AMediaExtractor_getSampleTrackIndex(AMediaExtractor*); * Returns the current sample's presentation time in microseconds. * or -1 if no more samples are available. */ -int64_t AMediaExtractor_getSampletime(AMediaExtractor*); +int64_t AMediaExtractor_getSampleTime(AMediaExtractor*); /** * Advance to the next sample. Returns false if no more sample data diff --git a/media/ndk/NdkMediaExtractor.cpp b/media/ndk/NdkMediaExtractor.cpp index b0a9590..f9f9ac3 100644 --- a/media/ndk/NdkMediaExtractor.cpp +++ b/media/ndk/NdkMediaExtractor.cpp @@ -205,7 +205,7 @@ int AMediaExtractor_getSampleTrackIndex(AMediaExtractor *mData) { } EXPORT -int64_t AMediaExtractor_getSampletime(AMediaExtractor *mData) { +int64_t AMediaExtractor_getSampleTime(AMediaExtractor *mData) { int64_t time; if (mData->mImpl->getSampleTime(&time) != OK) { return -1; |