diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-02 21:11:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-02 21:11:32 +0000 |
| commit | 98274d96f511e1af9b8b0821e47ab5ca98319b08 (patch) | |
| tree | e1236d5bbccd0d5a7016610b80d7bd2c3f7f1cda /media/java/android/media/MediaCodec.java | |
| parent | 3e4f4f9933f81cdf13b0cb1836fd0b3ea0c36ea1 (diff) | |
| parent | af521c4cedf038b57b6fee6ba1726a992c9a9c65 (diff) | |
Merge "Fix MediaCodec FLAC Javadoc" into oc-mr1-dev am: 546c644f27 am: af521c4ced
Change-Id: Id28175d26ec9910e184d5520cdf280e3ab831cf4
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 510ee442f852..29fa0ab200e5 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> |