LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 488f2392: Merge "getSampletime -> getSampleTime"

Browse Source 
* commit '488f2392a55e426f63966f118bfbf46c3f850f35':
  getSampletime -> getSampleTime
This commit is contained in:
Andrew Hsieh
2014-07-17 12:30:39 +00:00
committed by Android Git Automerger
parent b240fe6de0 488f2392a5
commit 61aaedb278
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ndk/platforms/android-L/arch-arm/symbols/libmediandk.so.functions.txt
View File

@@ -55,8 +55,8 @@ AMediaExtractor_delete
AMediaExtractor_getPsshInfo
AMediaExtractor_getSampleCryptoInfo
AMediaExtractor_getSampleFlags
AMediaExtractor_getSampleTime
AMediaExtractor_getSampleTrackIndex
AMediaExtractor_getSampletime
AMediaExtractor_getTrackCount
AMediaExtractor_getTrackFormat
AMediaExtractor_new

2
ndk/platforms/android-L/arch-arm64/symbols/libmediandk.so.functions.txt
View File

@@ -55,8 +55,8 @@ AMediaExtractor_delete
AMediaExtractor_getPsshInfo
AMediaExtractor_getSampleCryptoInfo
AMediaExtractor_getSampleFlags
AMediaExtractor_getSampleTime
AMediaExtractor_getSampleTrackIndex
AMediaExtractor_getSampletime
AMediaExtractor_getTrackCount
AMediaExtractor_getTrackFormat
AMediaExtractor_new

2
ndk/platforms/android-L/arch-mips/symbols/libmediandk.so.functions.txt
View File

@@ -55,8 +55,8 @@ AMediaExtractor_delete
AMediaExtractor_getPsshInfo
AMediaExtractor_getSampleCryptoInfo
AMediaExtractor_getSampleFlags
AMediaExtractor_getSampleTime
AMediaExtractor_getSampleTrackIndex
AMediaExtractor_getSampletime
AMediaExtractor_getTrackCount
AMediaExtractor_getTrackFormat
AMediaExtractor_new

2
ndk/platforms/android-L/arch-mips64/symbols/libmediandk.so.functions.txt
View File

@@ -55,8 +55,8 @@ AMediaExtractor_delete
AMediaExtractor_getPsshInfo
AMediaExtractor_getSampleCryptoInfo
AMediaExtractor_getSampleFlags
AMediaExtractor_getSampleTime
AMediaExtractor_getSampleTrackIndex
AMediaExtractor_getSampletime
AMediaExtractor_getTrackCount
AMediaExtractor_getTrackFormat
AMediaExtractor_new

2
ndk/platforms/android-L/arch-x86/symbols/libmediandk.so.functions.txt
View File

@@ -55,8 +55,8 @@ AMediaExtractor_delete
AMediaExtractor_getPsshInfo
AMediaExtractor_getSampleCryptoInfo
AMediaExtractor_getSampleFlags
AMediaExtractor_getSampleTime
AMediaExtractor_getSampleTrackIndex
AMediaExtractor_getSampletime
AMediaExtractor_getTrackCount
AMediaExtractor_getTrackFormat
AMediaExtractor_new

2
ndk/platforms/android-L/arch-x86_64/symbols/libmediandk.so.functions.txt
View File

@@ -55,8 +55,8 @@ AMediaExtractor_delete
AMediaExtractor_getPsshInfo
AMediaExtractor_getSampleCryptoInfo
AMediaExtractor_getSampleFlags
AMediaExtractor_getSampleTime
AMediaExtractor_getSampleTrackIndex
AMediaExtractor_getSampletime
AMediaExtractor_getTrackCount
AMediaExtractor_getTrackFormat
AMediaExtractor_new

2
ndk/platforms/android-L/include/media/NdkMediaExtractor.h
View File

@@ -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