summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMonty <xiphmont@xiph.org>2010-03-25 20:28:17 +0000
committerMonty <xiphmont@xiph.org>2010-03-25 20:28:17 +0000
commitf643a4cc2cb49b44b80825f7537ec5ed09c7db30 (patch)
treec70753ffb1acb639d512a3f2308c6bfc0653b940 /doc
parentf4c649519801ef31a3731becff85ce7368498989 (diff)
downloadogg-git-f643a4cc2cb49b44b80825f7537ec5ed09c7db30.tar.gz
Update CHANGES file
Correct one last misleading caption in the stream documentation, pending the more complete examples rewrite langing post 1.2.0 svn path=/trunk/ogg/; revision=17033
Diffstat (limited to 'doc')
-rw-r--r--doc/oggstream.html23
1 files changed, 10 insertions, 13 deletions
diff --git a/doc/oggstream.html b/doc/oggstream.html
index 29ecd82..485747d 100644
--- a/doc/oggstream.html
+++ b/doc/oggstream.html
@@ -462,7 +462,7 @@ preceding segment have terminated. </p>
<em>[More to come shortly; this section is currently being revised and expanded]</em>
-<p>Below, we present an example of a grouped and chained bitstream:</p>
+<p>Below, we present an example of a multiplexed and chained bitstream:</p>
<p><img src="stream.png" alt="stream"/></p>
@@ -471,18 +471,15 @@ multiplexed into a physical bitstream. Note the following
characteristics:</p>
<ol>
-<li>Grouped bitstreams begin together; all of the initial pages
-must appear before any data pages. When concurrently multiplexed
-groups are chained, the new group does not begin until all the
-bitstreams in the previous group have terminated.</li>
-
-<li>The pages of concurrently multiplexed bitstreams need not conform
-to a regular order; the only requirement is that page <tt>n</tt> of a
-logical bitstream follow page <tt>n-1</tt> in the physical bitstream.
-There are no restrictions on intervening pages belonging to other
-logical bitstreams. (Tying page appearance to bitrate demands is one
-logical strategy, ie, the page appears at the chronological point
-where decode requires more information).</li>
+<li>Multiplexed bitstreams in a given link begin together; all of the
+initial pages must appear before any data pages. When concurrently
+multiplexed groups are chained, the new group does not begin until all
+the bitstreams in the previous group have terminated.</li>
+
+<li>The ordering of pages of concurrently multiplexed bitstreams is
+goverened by timestamp (not shown here); there is no regular
+interleaving order. Pages within a logical bitstream appear in
+sequence order.</li>
</ol>
<div id="copyright">