summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2018-07-16 19:12:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-07-16 19:12:32 +0000
commit15ae72085fc55eb441d2ff7f3d6b04c8e776925b (patch)
treee7fd5238cdbfcc78b2e434d490efc1a28f0610f6
parent0e5e46f874a3ecf7ab0a9a7953132a23f5ef59e4 (diff)
parent55135d5d5f7017991b682ae35ed703db91fb493e (diff)
downloadbase-15ae72085fc55eb441d2ff7f3d6b04c8e776925b.tar.gz
Merge "Fix broken javadoc link in MediaFormat" into pi-dev
-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 7c68b5597467..2a2f4fe757d5 100644
--- a/media/java/android/media/MediaFormat.java
+++ b/media/java/android/media/MediaFormat.java
@@ -143,7 +143,7 @@ public final class MediaFormat {
* MIME type for HEIF still image data encoded in HEVC.
*
* To decode such an image, {@link MediaCodec} decoder for
- * {@ #MIMETYPE_VIDEO_HEVC} shall be used. The client needs to form
+ * {@link #MIMETYPE_VIDEO_HEVC} shall be used. The client needs to form
* the correct {@link #MediaFormat} based on additional information in
* the track format, and send it to {@link MediaCodec#configure}.
*