diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-11-19 10:56:26 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-19 10:56:26 -0800 |
| commit | fb77461234f29f258a78062065fb5d2db9cc5610 (patch) | |
| tree | 37dbdaf2cf7260b79df859dc9e836b2e5f9d196e /docs | |
| parent | 44138f15cef6cfc84686f39227cf61062eb7817e (diff) | |
| parent | 00f502a38cc4d6e2278f962b04308e6590dba36b (diff) | |
| download | frameworks_base-fb77461234f29f258a78062065fb5d2db9cc5610.zip frameworks_base-fb77461234f29f258a78062065fb5d2db9cc5610.tar.gz frameworks_base-fb77461234f29f258a78062065fb5d2db9cc5610.tar.bz2 | |
am 00f502a3: am 0e29064d: Merge "Doc change: update media formats table." into gingerbread
* commit '00f502a38cc4d6e2278f962b04308e6590dba36b':
Doc change: update media formats table.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/guide/appendix/media-formats.jd | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/guide/appendix/media-formats.jd b/docs/html/guide/appendix/media-formats.jd index 94a6471..8709994 100644 --- a/docs/html/guide/appendix/media-formats.jd +++ b/docs/html/guide/appendix/media-formats.jd @@ -22,7 +22,7 @@ page.title=Android Supported Media Formats <tr> <td rowspan="9">Audio</td> <td>AAC LC/LTP</td> -<td> </td> +<td style="text-align: center;">X</td> <td style="text-align: center;">X</td> <td rowspan="3">Mono/Stereo content in any combination of standard bit rates up to 160 kbps and sampling rates from 8 to 48kHz</td> <td rowspan="3">3GPP (.3gp) and MPEG-4 (.mp4, .m4a). No support for raw AAC (.aac)</td> @@ -51,7 +51,7 @@ page.title=Android Supported Media Formats <tr> <td>AMR-WB</td> -<td> </td> +<td style="text-align: center;">X</td> <td style="text-align: center;">X</td> <td>9 rates from 6.60 kbit/s to 23.85 kbit/s sampled @ 16kHz</td> <td>3GPP (.3gp)</td> @@ -109,7 +109,7 @@ page.title=Android Supported Media Formats <tr> <td>PNG</td> -<td> </td> +<td style="text-align: center;">X</td> <td style="text-align: center;">X</td> <td> </td> <td>PNG (.png)</td> |