提交: 03bdd73cca7e5f2d2b858aab0040259f9b96ebf7 - frameworks-base (git)

frameworks/base

Commit MetaInfo

• 修訂: 03bdd73cca7e5f2d2b858aab0040259f9b96ebf7 (tree)
• 時間: 2020-01-03 06:50:42
• 作者: Automerger Merge Worker <android-build-automerger-merge-worker@syst...>
• Commiter: Automerger Merge Worker

Log Message

Merge "Fix MediaCodec FLAC Javadoc" into oc-mr1-dev am: 546c644f27 am: af521c4ced am: 98274d96f5 am: 9868e4c737

Change-Id: I60a049225fd042ee6c559c0a1dcbc99b4b49d92e

Change Summary

• modified: media/java/android/media/MediaCodec.java

差異

--- a/media/java/android/media/MediaCodec.java
+++ b/media/java/android/media/MediaCodec.java
@@ -362,7 +362,8 @@ import java.util.concurrent.locks.ReentrantLock;
    </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>