summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jean-Baptiste Queru <jbq@google.com> 2013-07-29 16:07:12 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-07-29 16:07:12 -0700
commit00157c0d466786e7f125f58257ff706e132c52ef (patch)
tree5a5ddcd91ee4bd589ed3e4a1afa1aca44c66c7d7
parent443feae63df2cadf7b728991118dd73527d587c8 (diff)
parent6c0fe0df4ea35fba69f805e18c8c88c0be31c36f (diff)
am 6c0fe0df: Merge "MediaFormat: Fix the documentation link to the AAC profile constants"
* commit '6c0fe0df4ea35fba69f805e18c8c88c0be31c36f': MediaFormat: Fix the documentation link to the AAC profile constants
-rw-r--r--media/java/android/media/MediaFormat.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java
index a2eb8d99ee2f..fcca39054f4a 100644
--- a/media/java/android/media/MediaFormat.java
+++ b/media/java/android/media/MediaFormat.java
@@ -154,7 +154,7 @@ public final class MediaFormat {
/**
* A key describing the AAC profile to be used (AAC audio formats only).
- * Constants are declared in {@link android.media.MediaCodecInfo.CodecCapabilities}.
+ * Constants are declared in {@link android.media.MediaCodecInfo.CodecProfileLevel}.
*/
public static final String KEY_AAC_PROFILE = "aac-profile";