diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-08-30 14:54:23 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-30 14:54:24 -0700 |
| commit | 4dc187b43a77be3785c76f42c2fed598f4cee5da (patch) | |
| tree | f2cfa8d0ee569ada0adccbbadc51aab51f94cdde | |
| parent | 92c0e3757dd7800c9537483f9e7bc0165bc8bdd0 (diff) | |
| parent | a242deb1de365f0ed0032a87565df1971cb6bbe2 (diff) | |
| download | frameworks_base-4dc187b43a77be3785c76f42c2fed598f4cee5da.zip frameworks_base-4dc187b43a77be3785c76f42c2fed598f4cee5da.tar.gz frameworks_base-4dc187b43a77be3785c76f42c2fed598f4cee5da.tar.bz2 | |
Merge "Fix a typo in the sample code" into jb-mr1-dev
| -rw-r--r-- | media/java/android/media/MediaExtractor.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/MediaExtractor.java b/media/java/android/media/MediaExtractor.java index 4b8d3cb..749ef12 100644 --- a/media/java/android/media/MediaExtractor.java +++ b/media/java/android/media/MediaExtractor.java @@ -45,7 +45,7 @@ import java.util.Map; * } * ByteBuffer inputBuffer = ByteBuffer.allocate(...) * while (extractor.readSampleData(inputBuffer, ...) >= 0) { - * int trackIndex = extractor.getTrackIndex(); + * int trackIndex = extractor.getSampleTrackIndex(); * long presentationTimeUs = extractor.getSampleTime(); * ... * extractor.advance(); |