diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-02 20:47:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-02 20:47:01 +0000 |
| commit | af521c4cedf038b57b6fee6ba1726a992c9a9c65 (patch) | |
| tree | 7e4ea4908ff6c3e1a45bfd108b839dbbc7281ed4 /media/java/android/media/MediaCodec.java | |
| parent | 929b23ac43dff1a4be24818504ea9806293e892c (diff) | |
| parent | 546c644f2792af57ed8a280d2fa14db447c073ee (diff) | |
Merge "Fix MediaCodec FLAC Javadoc" into oc-mr1-dev am: 546c644f27
Change-Id: I511da6d59c3b525cb678d6bb08a6cfa8e4e5a94f
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 bb7b0380f07d..527efede3cda 100644 --- 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> |