am f443c5e: Merge "Minor corrections to the javadoc overview to refle…

…ct late API changes." into jb-dev * commit 'f443c5ea2c67285322d4790e5bee4c3c6f6af1ae': Minor corrections to the javadoc overview to reflect late API changes.
sunwaysunway · Jun 28, 2012 · 00a8260 · 00a8260
2 parents 9e75d57 + f443c5e
commit 00a8260
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java
@@ -33,7 +33,7 @@
  * codec.start();
  * ByteBuffer[] inputBuffers = codec.getInputBuffers();
  * ByteBuffer[] outputBuffers = codec.getOutputBuffers();
- * Map<String, Object> format = codec.getOutputFormat();
+ * MediaFormat format = codec.getOutputFormat();
  * for (;;) {
  * int inputBufferIndex = codec.dequeueInputBuffer(timeoutUs);
  * if (inputBufferIndex &gt;= 0) {

diff --git a/media/java/android/media/MediaExtractor.java b/media/java/android/media/MediaExtractor.java
@@ -36,8 +36,8 @@
  * extractor.setDataSource(...);
  * int numTracks = extractor.getTrackCount();
  * for (int i = 0; i &lt; numTracks; ++i) {
- * Map%lt;String, Object&gt; format = extractor.getTrackFormat(i);
- * String mime = (String)format.get("mime");
+ * MediaFormat format = extractor.getTrackFormat(i);
+ * String mime = format.getString(MediaFormat.KEY_MIME);
  * if (weAreInterestedInThisTrack) {
  * extractor.selectTrack(i);
  * }