summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-05-29 08:04:34 -0700
committerMarco Nelissen <marcone@google.com>2014-05-29 08:04:34 -0700
commiteb4860c305def68c5965474bb43c67c2c9d49bbb (patch)
treed2d6b8af92ab837bb52ca4f55ea1d08406f4c3c6
parentdd114d19f65d8a5cdfddbaf6d3ef8119c6169b28 (diff)
downloadframeworks_av-eb4860c305def68c5965474bb43c67c2c9d49bbb.zip
frameworks_av-eb4860c305def68c5965474bb43c67c2c9d49bbb.tar.gz
frameworks_av-eb4860c305def68c5965474bb43c67c2c9d49bbb.tar.bz2
getSampletime -> getSampleTime
Change-Id: I87aaa87be068d414903a0e1e22bfe4183cf45ab0
-rw-r--r--include/ndk/NdkMediaExtractor.h2
-rw-r--r--media/ndk/NdkMediaExtractor.cpp2
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;