Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91315577 authored by Roman Nurik's avatar Roman Nurik Committed by Android Git Automerger
Browse files

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

* commit '5a41a8a0':
  Document support for .TS video containers.
parents 6f7e4cb5 5a41a8a0

docs/html/guide/appendix/media-formats.jd

+1 −1
Original line number Diff line number Diff line
@@ -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>