Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 798ce934 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "getSampletime -> getSampleTime"

parents 7f692022 eb4860c3

include/ndk/NdkMediaExtractor.h

+1 −1
Original line number Diff line number Diff line
@@ -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

media/ndk/NdkMediaExtractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;