[xiph-commits] r15540 - in trunk/vorbis: . doc doc/xml lib

ivo at svn.xiph.org ivo at svn.xiph.org
Wed Nov 26 16:25:51 PST 2008 

Author: ivo
Date: 2008-11-26 16:25:49 -0800 (Wed, 26 Nov 2008)
New Revision: 15540

Modified:
   trunk/vorbis/CHANGES
   trunk/vorbis/configure.ac
   trunk/vorbis/doc/Vorbis_I_spec.html
   trunk/vorbis/doc/xml/a1-encapsulation_ogg.xml
   trunk/vorbis/lib/info.c
Log:
Update outdated documentation to refer to the new media types.  Bump version number.  Fill changelog.

Modified: trunk/vorbis/CHANGES
===================================================================
--- trunk/vorbis/CHANGES	2008-11-26 21:21:40 UTC (rev 15539)
+++ trunk/vorbis/CHANGES	2008-11-27 00:25:49 UTC (rev 15540)
@@ -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.

Modified: trunk/vorbis/configure.ac
===================================================================
--- trunk/vorbis/configure.ac	2008-11-26 21:21:40 UTC (rev 15539)
+++ trunk/vorbis/configure.ac	2008-11-27 00:25:49 UTC (rev 15540)
@@ -5,7 +5,7 @@
 dnl ------------------------------------------------
 
 
-AC_INIT([libvorbis],[1.2.1svn],[vorbis-dev at xiph.org])
+AC_INIT([libvorbis],[1.2.2],[vorbis-dev at xiph.org])
 
 AC_CONFIG_SRCDIR([lib/mdct.c])
 

Modified: trunk/vorbis/doc/Vorbis_I_spec.html
===================================================================
--- trunk/vorbis/doc/Vorbis_I_spec.html	2008-11-26 21:21:40 UTC (rev 15539)
+++ trunk/vorbis/doc/Vorbis_I_spec.html	2008-11-27 00:25:49 UTC (rev 15540)
@@ -2184,18 +2184,20 @@
 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

Modified: trunk/vorbis/doc/xml/a1-encapsulation_ogg.xml
===================================================================
--- trunk/vorbis/doc/xml/a1-encapsulation_ogg.xml	2008-11-26 21:21:40 UTC (rev 15539)
+++ trunk/vorbis/doc/xml/a1-encapsulation_ogg.xml	2008-11-27 00:25:49 UTC (rev 15540)
@@ -56,11 +56,11 @@
 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 @@
 <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>
 

Modified: trunk/vorbis/lib/info.c
===================================================================
--- trunk/vorbis/lib/info.c	2008-11-26 21:21:40 UTC (rev 15539)
+++ trunk/vorbis/lib/info.c	2008-11-27 00:25:49 UTC (rev 15540)
@@ -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){

More information about the commits mailing list