commit f16b211ebfe36544bae832f9b9968b9640720be3
author Scott Main <smain@google.com> Thu Jun 28 12:06:39 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 28 12:06:39 2012 -0700
tree 4cfc65e97177d73c7a9c94b480805860c09b5ef8
parent e3fe04165b72dbb60db452d6b2593f96f3e6dd7d
parent 00a82605a17360f5b9005035a75d779a231d5a5c

am 00a82605: am f443c5ea: Merge "Minor corrections to the javadoc overview to reflect late API changes." into jb-dev

* commit '00a82605a17360f5b9005035a75d779a231d5a5c':
  Minor corrections to the javadoc overview to reflect late API changes.

media/java/android/media/MediaCodec.java

diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java
index fcb676d..560c549 100644
--- 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) {

media/java/android/media/MediaExtractor.java

diff --git a/media/java/android/media/MediaExtractor.java b/media/java/android/media/MediaExtractor.java
index d3a00c2..9f10cb0 100644
--- 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 < numTracks; ++i) {
- *   Map%lt;String, Object> 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);
  *   }