Update outdated documentation to refer to the new media types. Bump version number...

svn path=/trunk/vorbis/; revision=15540

diff --git a/CHANGES b/CHANGES
index aac1fd2..a3b8117 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+libvorbis 1.2.2 (unreleased) -- "Xiph.Org libVorbis I 20081127"
+
+ * define VENDOR and ENCODER strings
+ * seek correctly in files bigger than 2 GB (Windows)
+ * fix regression from CVE-2008-1420; 1.0b1 files work again
+ * mark all tables as constant to reduce memory occupation
+
 libvorbis 1.2.1 (unreleased) -- "Xiph.Org libVorbis I 20080501"
 
  * Improved robustness with corrupt streams.

diff --git a/configure.ac b/configure.ac
index 709665e..3451e23 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl Initialization and Versioning
 dnl ------------------------------------------------
 
 
-AC_INIT([libvorbis],[1.2.1svn],[vorbis-dev@xiph.org])
+AC_INIT([libvorbis],[1.2.2],[vorbis-dev@xiph.org])
 
 AC_CONFIG_SRCDIR([lib/mdct.c])
 

diff --git a/doc/Vorbis_I_spec.html b/doc/Vorbis_I_spec.html
index 9c75e85..790a7c3 100644 (file)
--- a/doc/Vorbis_I_spec.html
+++ b/doc/Vorbis_I_spec.html
@@ -2184,18 +2184,20 @@ form only. That is:
 This is not to say that it is not currently possible to multiplex
 Vorbis with other media types into a multi-stream Ogg file.  At the
 time this document was written, Ogg was becoming a popular container
-for low-bitrate movies consisting of DiVX video and Vorbis audio.
+for low-bitrate movies consisting of DivX video and Vorbis audio.
 However, a 'Vorbis I audio file' is taken to imply Vorbis audio
 existing alone within a degenerate Ogg stream.  A compliant 'Vorbis
 audio player' is not required to implement Ogg support beyond the
-specific support of Vorbis within a degenrate ogg stream (naturally,
+specific support of Vorbis within a degenrate Ogg stream (naturally,
 application authors are encouraged to support full multiplexed Ogg
 handling).
 </p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id319459"></a>1.1.2. MIME type</h4></div></div></div><p>
-The correct MIME type of any Ogg file is <code class="literal">application/ogg</code>.
-However, if a file is a Vorbis I audio file (which implies a
-degenerate Ogg stream including only unmultiplexed Vorbis audio), the
-mime type <code class="literal">audio/x-vorbis</code> is also allowed.</p></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id317588"></a>1.2. Encapsulation</h3></div></div></div><p>
+The MIME type of Ogg files depend on the context.  Specifically, complex
+multimedia and applications should use <code class="literal">application/ogg</code>,
+while visual media should use <code class="literal">video/ogg</code>, and audio
+<code class="literal">audio/ogg</code>.  Vorbis data encapsulated in Ogg may appear
+in any of those types.  RTP encapsulated Vorbis should use
+<code class="literal">audio/vorbis</code> + <code class="literal">audio/vorbis-config</code>.</p></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id317588"></a>1.2. Encapsulation</h3></div></div></div><p>
 Ogg encapsulation of a Vorbis packet stream is straightforward.</p><div class="itemizedlist"><ul type="disc"><li>
   The first Vorbis packet (the identification header), which
   uniquely identifies a stream as Vorbis audio, is placed alone in the

diff --git a/doc/xml/a1-encapsulation_ogg.xml b/doc/xml/a1-encapsulation_ogg.xml
index 676b983..3364847 100644 (file)
--- a/doc/xml/a1-encapsulation_ogg.xml
+++ b/doc/xml/a1-encapsulation_ogg.xml
@@ -56,11 +56,11 @@ form only. That is:
 This is not to say that it is not currently possible to multiplex
 Vorbis with other media types into a multi-stream Ogg file.  At the
 time this document was written, Ogg was becoming a popular container
-for low-bitrate movies consisting of DiVX video and Vorbis audio.
+for low-bitrate movies consisting of DivX video and Vorbis audio.
 However, a 'Vorbis I audio file' is taken to imply Vorbis audio
 existing alone within a degenerate Ogg stream.  A compliant 'Vorbis
 audio player' is not required to implement Ogg support beyond the
-specific support of Vorbis within a degenrate ogg stream (naturally,
+specific support of Vorbis within a degenrate Ogg stream (naturally,
 application authors are encouraged to support full multiplexed Ogg
 handling).
 </para>
@@ -70,10 +70,13 @@ handling).
 <section><title>MIME type</title>
 
 <para>
-The correct MIME type of any Ogg file is <literal>application/ogg</literal>.
-However, if a file is a Vorbis I audio file (which implies a
-degenerate Ogg stream including only unmultiplexed Vorbis audio), the
-mime type <literal>audio/x-vorbis</literal> is also allowed.</para>
+The MIME type of Ogg files depend on the context.  Specifically, complex
+multimedia and applications should use <literal>application/ogg</literal>,
+while visual media should use <literal>video/ogg</literal>, and audio
+<literal>audio/ogg</literal>.  Vorbis data encapsulated in Ogg may appear
+in any of those types.  RTP encapsulated Vorbis should use
+<literal>audio/vorbis</literal> + <literal>audio/vorbis-config<literal>.
+</para>
 
 </section>
 

diff --git a/lib/info.c b/lib/info.c
index 9574730..c0fb00e 100644 (file)
--- a/lib/info.c
+++ b/lib/info.c
@@ -31,8 +31,8 @@
 #include "misc.h"
 #include "os.h"
 
-#define GENERAL_VENDOR_STRING "Xiph.Org libVorbis 1.2.1"
-#define ENCODE_VENDOR_STRING "Xiph.Org libVorbis I 20080501"
+#define GENERAL_VENDOR_STRING "Xiph.Org libVorbis 1.2.2"
+#define ENCODE_VENDOR_STRING "Xiph.Org libVorbis I 20081127"
 
 /* helpers */
 static int ilog2(unsigned int v){