diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-02 22:17:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-02 22:17:40 +0000 |
| commit | 91cc8bc605eb1c8f878e40a28d64ce19f102deeb (patch) | |
| tree | c5993efb4b6d6a787dc32f76eb38e72533a7cc39 /media/java/android/media/MediaCodec.java | |
| parent | c4daa6494b9dab84b064b1ce12b47022c1e04193 (diff) | |
| parent | 1c80c22f40675b5e26ba8e5c2aeb2d5868a6df1f (diff) | |
Merge "Fix MediaCodec FLAC Javadoc" into oc-mr1-dev am: 546c644f27 am: af521c4ced am: 98274d96f5 am: 9868e4c737 am: 03bdd73cca am: 1c80c22f40
Change-Id: I1de34ea1a389fb7a318e1c7d8b6e96c84ef404fe
Diffstat (limited to 'media/java/android/media/MediaCodec.java')
| -rw-r--r-- | media/java/android/media/MediaCodec.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java index 176bb37130a7..f780d40d349b 100644 --- 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> |