Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03bdd73c authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Merge "Fix MediaCodec FLAC Javadoc" into oc-mr1-dev am: 546c644f am: af521c4c am: 98274d96 am: 9868e4c7

Change-Id: I60a049225fd042ee6c559c0a1dcbc99b4b49d92e
parents 15783772 9868e4c7

media/java/android/media/MediaCodec.java

+2 −1
Original line number Diff line number Diff line
@@ -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>