Merge "Fix MediaCodec FLAC Javadoc" into oc-mr1-dev am: 546c644f27

[android-x86/frameworks-base.git] / media / java / android / media / MediaCodec.java

diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java
index bb7b038..527efed 100644 (file)
--- a/media/java/android/media/MediaCodec.java
+++ b/media/java/android/media/MediaCodec.java
@@ -341,7 +341,8 @@ import java.util.Map;
    </tr>
    <tr>
     <td>FLAC</td>
-    <td>mandatory metadata block (called the STREAMINFO block),<br>
+    <td>"fLaC", the FLAC stream marker in ASCII,<br>
+        followed by the STREAMINFO block (the mandatory metadata block),<br>
         optionally followed by any number of other metadata blocks</td>
     <td class=NA>Not Used</td>
     <td class=NA>Not Used</td>