diff options
| author | 2011-04-04 13:47:34 -0700 | |
|---|---|---|
| committer | 2011-04-04 13:47:34 -0700 | |
| commit | 84967294f25d223ff2c5e62378b40f20fd853c4c (patch) | |
| tree | 9883719efb3a6211251c8ab70fe406712a04a990 | |
| parent | cbfeda13e7da5c1cdf6f02e76d81ac5f878b1225 (diff) | |
| parent | 9131557721afc93626f0fcbbe6e485a0c863cc87 (diff) | |
am 91315577: am 5a41a8a0: Merge "Document support for .TS video containers." into honeycomb-mr1
* commit '9131557721afc93626f0fcbbe6e485a0c863cc87':
Document support for .TS video containers.
| -rw-r--r-- | docs/html/guide/appendix/media-formats.jd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/guide/appendix/media-formats.jd b/docs/html/guide/appendix/media-formats.jd index 34a4c1861c56..7f77b5f97c29 100644 --- a/docs/html/guide/appendix/media-formats.jd +++ b/docs/html/guide/appendix/media-formats.jd @@ -194,7 +194,7 @@ no dither applied for 24-bit. <td style="text-align: center;" nowrap><big>•</big><br><small>(Android 3.0+)</small></td> <td style="text-align: center;"><big>•</big></td> <td>Baseline Profile (BP)</td> -<td>3GPP (.3gp) and MPEG-4 (.mp4)</td> +<td>3GPP (.3gp) and MPEG-4 (.mp4). MPEG-TS (.ts, AAC audio only, not seekable, Android 3.0+)</td> </tr> <tr> |