Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5a41a8a0: Merge "Document support for .TS video containers." into honeycomb-mr1

Browse Source 
* commit '5a41a8a0fda21d5332f1355832550fcfffbb9975':
  Document support for .TS video containers.
This commit is contained in:
Roman Nurik
2011-04-04 13:44:23 -07:00
committed by Android Git Automerger
parent 6f7e4cb5ae 5a41a8a0fd
commit 9131557721
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/html/guide/appendix/media-formats.jd
View File

@@ -194,7 +194,7 @@ no dither applied for 24-bit.
<td style="text-align: center;" nowrap><big>&bull;</big><br><small>(Android 3.0+)</small></td>
<td style="text-align: center;"><big>&bull;</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>