diff options
| author | Roman Nurik <romannurik@google.com> | 2011-02-22 21:14:52 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-22 21:14:52 -0800 |
| commit | c49992c91ca086fac89310f38a1e66968db34a8a (patch) | |
| tree | 31ae4ae39cdd08de0b6faf044234a3dbbb1c468e /docs | |
| parent | 4c9647cf4c01d4b8e0fce693a1b85743d7df8695 (diff) | |
| parent | 4f4cab75cc0dff361d181299f07a233e8bb1e1c0 (diff) | |
| download | frameworks_base-c49992c91ca086fac89310f38a1e66968db34a8a.zip frameworks_base-c49992c91ca086fac89310f38a1e66968db34a8a.tar.gz frameworks_base-c49992c91ca086fac89310f38a1e66968db34a8a.tar.bz2 | |
am 4f4cab75: Merge "Document support for WebM/VP8 decoding." into honeycomb
* commit '4f4cab75cc0dff361d181299f07a233e8bb1e1c0':
Document support for WebM/VP8 decoding.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/guide/appendix/media-formats.jd | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/docs/html/guide/appendix/media-formats.jd b/docs/html/guide/appendix/media-formats.jd index bac6bf4..8509466 100644 --- a/docs/html/guide/appendix/media-formats.jd +++ b/docs/html/guide/appendix/media-formats.jd @@ -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>•</big></td> <td style="text-align: center;"><big>•</big></td> @@ -192,6 +192,14 @@ page.title=Android Supported Media Formats <td>3GPP (.3gp)</td> </tr> +<tr> +<td>VP8</td> +<td> </td> +<td style="text-align: center;"><big>•</big><br><small>(Android 2.3.3+)</small></td> +<td> </td> +<td><a href="http://www.webmproject.org/">WebM</a> (.webm)</td> +</tr> + </tbody></table> |