diff options
| author | Roman Nurik <romannurik@google.com> | 2011-04-04 13:41:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-04 13:41:11 -0700 |
| commit | 5a41a8a0fda21d5332f1355832550fcfffbb9975 (patch) | |
| tree | 85b49795ec3d65e6c8d49f31c2de508c8929b427 | |
| parent | 3f39f653a90f9727d13be1e9908f0afb8fe66d6e (diff) | |
| parent | c1b34f3d8ee633cedd36e10cdba3aac5c582e507 (diff) | |
| download | frameworks_base-5a41a8a0fda21d5332f1355832550fcfffbb9975.zip frameworks_base-5a41a8a0fda21d5332f1355832550fcfffbb9975.tar.gz frameworks_base-5a41a8a0fda21d5332f1355832550fcfffbb9975.tar.bz2 | |
Merge "Document support for .TS video containers." into honeycomb-mr1
| -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 34a4c18..7f77b5f 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> |