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

Commit 4f4cab75 authored by Roman Nurik's avatar Roman Nurik Committed by Android (Google) Code Review
Browse files

Merge "Document support for WebM/VP8 decoding." into honeycomb

parents beb01c93 a02c3cbe

docs/html/guide/appendix/media-formats.jd

+9 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ page.title=Android Supported Media Formats 




<tr>

<td rowspan="3">Video</td>

<td rowspan="4">Video</td>

<td>H.263</td>

<td style="text-align: center;"><big>&bull;</big></td>

<td style="text-align: center;"><big>&bull;</big></td>
@@ -192,6 +192,14 @@ page.title=Android Supported Media Formats 
<td>3GPP (.3gp)</td>

</tr>



<tr>

<td>VP8</td>

<td>&nbsp;</td>

<td style="text-align: center;"><big>&bull;</big><br><small>(Android 2.3.3+)</small></td>

<td>&nbsp;</td>

<td><a href="http://www.webmproject.org/">WebM</a> (.webm)</td>

</tr>



</tbody></table>