Minor build fixes, integrate XMMS into the autoconfed stuff

Extend copyright notices to 2000
Add RCS Id tags to all files

Monty

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

diff --git a/Makefile.in b/Makefile.in
index 8e3a0669ce2dc928def19346336a2dc2ead98c49..9dd4b1d1a70d939109a1b7052813222784994fa1 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 # vorbis makefile configured for use with gcc on any platform
 
-# $Id: Makefile.in,v 1.3 1999/12/30 03:46:16 xiphmont Exp $
+# $Id: Makefile.in,v 1.4 1999/12/30 07:26:22 xiphmont Exp $
 
 ###############################################################################
 #                                                                             #
@@ -17,7 +17,11 @@
 
 @SET_MAKE@
 
-SUBDIRS =      lib examples #cmdline
+SUBDIRS =      lib vq examples # cmdline xmms
 
 all debug profile selftest target clean:
        @for dir in $(SUBDIRS); do (cd $$dir && $(MAKE) $(MFLAGS) $@) || exit 1; done
+       -rm -f *~
+
+distclean:     clean
+       -rm -f Makefile config.* 

diff --git a/configure b/configure
index 6f35d446ea664c175ed38919a13064b213146e31..f4b47d8d97479172b03a5d72f343f4a16b457208 100755 (executable)
--- a/configure
+++ b/configure
@@ -1929,7 +1929,7 @@ done
 
 ac_given_srcdir=$srcdir
 
-trap 'rm -fr `echo "Makefile lib/Makefile examples/Makefile vq/Makefile cmdline/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile lib/Makefile examples/Makefile vq/Makefile cmdline/Makefile xmms/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -2018,7 +2018,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile lib/Makefile examples/Makefile vq/Makefile cmdline/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile lib/Makefile examples/Makefile vq/Makefile cmdline/Makefile xmms/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

diff --git a/configure.in b/configure.in
index dc3c3f6189a571f35a9689412b3bd0cf83d1f2ad..ce579a30773d08a8a96345703f35a49c379dbc83 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.7 1999/12/30 03:46:18 xiphmont Exp $
+# $Id: configure.in,v 1.8 1999/12/30 07:26:25 xiphmont Exp $
 
 AC_INIT(lib/mdct.c)
 #AC_CONFIG_HEADER(config.h)
@@ -184,4 +184,4 @@ AC_SUBST(RANLIB)
 #AC_SUBST(LIBGTKDIR)
 AC_SUBST(pthread_lib)
 
-AC_OUTPUT(Makefile lib/Makefile examples/Makefile vq/Makefile cmdline/Makefile)
+AC_OUTPUT(Makefile lib/Makefile examples/Makefile vq/Makefile cmdline/Makefile xmms/Makefile)

diff --git a/examples/chaining_example.c b/examples/chaining_example.c
index 9299880320bfa8da0d0df8f296b5fd9f04ff0056..d15167a03d9e34adf2d03a9edfe98e985ebad702 100644 (file)
--- a/examples/chaining_example.c
+++ b/examples/chaining_example.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: illustrate simple use of chained bitstream and vorbisfile.a
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Nov 02 1999
+ last mod: $Id: chaining_example.c,v 1.2 1999/12/30 07:26:26 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/examples/decoder_example.c b/examples/decoder_example.c
index 8cd8bc83c6b86ae38175cb740bb8d69ec8e716c6..cd41e721868a9e40ccee3b2884c211e3da998b57 100644 (file)
--- a/examples/decoder_example.c
+++ b/examples/decoder_example.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: simple example decoder
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Nov 16 1999
+ last mod: $Id: decoder_example.c,v 1.2 1999/12/30 07:26:27 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/examples/encoder_example.c b/examples/encoder_example.c
index c84cd83bac0d7a5560728c508761e61608692a54..3a7a7305a0c02c39da1d4a58fb2acc82c758daaa 100644 (file)
--- a/examples/encoder_example.c
+++ b/examples/encoder_example.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: simple example encoder
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Nov 16 1999
+ last mod: $Id: encoder_example.c,v 1.2 1999/12/30 07:26:28 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/include/codec.h b/include/codec.h
index 49fef7a41e795c50c9e6a37c523d3ec87dd25061..4874d9062f71a2705afb845b23a9d440dbe2ffdb 100644 (file)
--- a/include/codec.h
+++ b/include/codec.h
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
- function: codec headers
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Dec 29 1999
+ function: libvorbis codec headers
+ last mod: $Id: codec.h,v 1.2 1999/12/30 07:26:29 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/include/vorbisfile.h b/include/vorbisfile.h
index 6e9d5b5a1df0aa8f01f7586e4a9df03094de591b..27794e944bb995c4e92395a596308f662430c24d 100644 (file)
--- a/include/vorbisfile.h
+++ b/include/vorbisfile.h
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: stdio-based convenience library for opening/seeking/decoding
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Nov 04 1999
+ last mod: $Id: vorbisfile.h,v 1.2 1999/12/30 07:26:30 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 4c2af96235b2a4e029a637399717cc4220c8a136..4d3971b2eb6fb4528ca9a0dfc12b5d78489c8d4d 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,6 +1,6 @@
 # vorbis makefile configured for use with gcc on any platform
 
-# $Id: Makefile.in,v 1.16 1999/12/30 03:46:19 xiphmont Exp $
+# $Id: Makefile.in,v 1.17 1999/12/30 07:26:31 xiphmont Exp $
 
 ###############################################################################
 #                                                                             #
@@ -75,5 +75,5 @@ clean:
        -rm -f *.o *.a test* *~ *.out ogg config.* tone 
 
 distclean:     clean
-       -rf -f Makefile
+       -rm -f Makefile
 

diff --git a/lib/analysis.c b/lib/analysis.c
index 1de5999021697dbdab42430d835ca13d4650e334..31adfb9feb38044dbcc701d0b2eff2af5ed54918 100644 (file)
--- a/lib/analysis.c
+++ b/lib/analysis.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: single-block PCM analysis
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Nov 16 1999
+ last mod: $Id: analysis.c,v 1.18 1999/12/30 07:26:32 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/bitwise.c b/lib/bitwise.c
index 2b8f87ae2789982e1469e44a5a0cf3474e6dbd69..20cccd91a1b86ffd0ef5a5a13e7b2d05c62eb16c 100644 (file)
--- a/lib/bitwise.c
+++ b/lib/bitwise.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
   function: packing variable sized words into an octet stream
-  author: Monty <monty@xiph.org>
-  modifications by: Monty
-  last modification date: Aug 04 1999
+  last mod: $Id: bitwise.c,v 1.5 1999/12/30 07:26:33 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/bitwise.h b/lib/bitwise.h
index c614946d6fee6ee496607344dd2cc79593968082..0e56e93959f1320d01d6e9c13ea5ba1f223ff05c 100644 (file)
--- a/lib/bitwise.h
+++ b/lib/bitwise.h
@@ -5,13 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
   function: packing variable sized words into an octet stream
+  last mod: $Id: bitwise.h,v 1.3 1999/12/30 07:26:34 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/block.c b/lib/block.c
index a3b5f9fef764fa4506fd6dfec349798f582232e2..1d3320c7ca3759019f3aee7d0675b83848aa9a48 100644 (file)
--- a/lib/block.c
+++ b/lib/block.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: PCM data vector blocking, windowing and dis/reassembly
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Oct 22 1999
+ last mod: $Id: block.c,v 1.18 1999/12/30 07:26:35 xiphmont Exp $
 
  Handle windowing, overlap-add, etc of the PCM vectors.  This is made
  more amusing by Vorbis' current two allowed block sizes.

diff --git a/lib/envelope.c b/lib/envelope.c
index ffcc237410aaa8516a6a83ac5f31899b19f076f2..cbc0860996e1efb7d84291c98e5ff7a1e813c6e1 100644 (file)
--- a/lib/envelope.c
+++ b/lib/envelope.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: PCM data envelope analysis and manipulation
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Oct 22 1999
+ last mod: $Id: envelope.c,v 1.12 1999/12/30 07:26:36 xiphmont Exp $
 
  Preecho calculation.
 

diff --git a/lib/envelope.h b/lib/envelope.h
index d0b885be10acbd35f9caaf5f8344ccba9ba2d694..79840ea392718cf835d0c619213d93508eb99ac5 100644 (file)
--- a/lib/envelope.h
+++ b/lib/envelope.h
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: PCM data envelope analysis and manipulation
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Oct 22 1999
+ last mod: $Id: envelope.h,v 1.7 1999/12/30 07:26:37 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/framing.c b/lib/framing.c
index af3557326f5cbe8a004a7b76ab87d4bee19ad96f..46c0a9ec5ce97e9069a3c927ef1da64ca5d37f09 100644 (file)
--- a/lib/framing.c
+++ b/lib/framing.c
@@ -5,21 +5,19 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and the XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and the XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: code raw [Vorbis] packets into framed OggSquish stream and
            decode Ogg streams back into raw packets
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Jul 22 1999
+ last mod: $Id: framing.c,v 1.12 1999/12/30 07:26:38 xiphmont Exp $
 
  note: The CRC code is directly derived from public domain code by
- Ross Williams (ross@guest.adelaide.edu.au).  See framing.txt for
- details.
+ Ross Williams (ross@guest.adelaide.edu.au).  See docs/framing.html
+ for details.
 
  ********************************************************************/
 

diff --git a/lib/info.c b/lib/info.c
index d8cbec59ab94bd5624bb167427364b1e21888fc0..32447bf5f5ca13db79391c5f7b9f960e88a30f1b 100644 (file)
--- a/lib/info.c
+++ b/lib/info.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: maintain the info structure, info <-> header packets
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Nov 04 1999
+ last mod: $Id: info.c,v 1.11 1999/12/30 07:26:39 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/lpc.c b/lib/lpc.c
index 9bfb82281b2a513a44542006be6a2fd4af03e780..18c435ad5ab88316666123f7239c30fc99ff251f 100644 (file)
--- a/lib/lpc.c
+++ b/lib/lpc.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
   function: LPC low level routines
-  author: Monty <monty@xiph.org>
-  modifications by: Monty
-  last modification date: Nov 16 1999
+  last mod: $Id: lpc.c,v 1.10 1999/12/30 07:26:40 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/lpc.h b/lib/lpc.h
index abb35f1605869a25982b91c5c78a224c19be0bc1..4173ac6b4a458c1e7443f03e82a0d881bf3d05ee 100644 (file)
--- a/lib/lpc.h
+++ b/lib/lpc.h
@@ -5,13 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
   function: LPC low level routines
+  last mod: $Id: lpc.h,v 1.5 1999/12/30 07:26:41 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/lsp.c b/lib/lsp.c
index 1733d1832c150347cd0122f23b42a392ad044d06..f536ee161d5a0f5091d96d7719ec7facb52334fa 100644 (file)
--- a/lib/lsp.c
+++ b/lib/lsp.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
   function: LSP (also called LSF) conversion routines
-  author: Monty <monty@xiph.org>
-  modifications by: Monty
-  last modification date: Nov 16 1999
+  last mod: $Id: lsp.c,v 1.4 1999/12/30 07:26:42 xiphmont Exp $
 
   The LSP generation code is taken (with minimal modification) from
   "On the Computation of the LSP Frequencies" by Joseph Rothweiler

diff --git a/lib/lsp.h b/lib/lsp.h
index 02e3c76e9b12a6428284a93bc2ca588690311639..08aac5ec05c928fd62556e293d1b9e9f129c1f92 100644 (file)
--- a/lib/lsp.h
+++ b/lib/lsp.h
@@ -5,12 +5,18 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
+ ********************************************************************
+
+  function: LSP (also called LSF) conversion routines
+  last mod: $Id: lsp.h,v 1.3 1999/12/30 07:26:43 xiphmont Exp $
+
  ********************************************************************/
 
+
 #ifndef _V_LSP_H_
 #define _V_LSP_H_
 

diff --git a/lib/mdct.c b/lib/mdct.c
index 2311e3576fb148112838aa1e993e9d712ec0fe08..1755e40bb3ac7d261cb4a0a0a5b63ea24f87efd9 100644 (file)
--- a/lib/mdct.c
+++ b/lib/mdct.c
@@ -5,18 +5,15 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: modified discrete cosine transform
            power of two length transform only [16 <= n ]
-
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Oct 10 1999
+ last mod: $Id: mdct.c,v 1.13 1999/12/30 07:26:44 xiphmont Exp $
 
  Algorithm adapted from _The use of multirate filter banks for coding
  of high quality digital audio_, by T. Sporer, K. Brandenburg and

diff --git a/lib/mdct.h b/lib/mdct.h
index 4337ca3edb8fd9d4192d238f4e30d6282b73ff30..80e210c31ed45e304ee582e4284c083d64cf269a 100644 (file)
--- a/lib/mdct.h
+++ b/lib/mdct.h
@@ -5,13 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty and The XIPHOPHORUS Company                        *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: modified discrete cosine transform prototypes
+ last mod: $Id: mdct.h,v 1.8 1999/12/30 07:26:45 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/os.h b/lib/os.h
index 261712f42a6b124da3f4a12a71bafdcc6cab4841..6ec52185540712cd9e106abd22e9953360d7cf94 100644 (file)
--- a/lib/os.h
+++ b/lib/os.h
@@ -5,13 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
-  function: #ifdef jail to whip a few platforms into the UNIX ideal.
+ function: #ifdef jail to whip a few platforms into the UNIX ideal.
+ last mod: $Id: os.h,v 1.2 1999/12/30 07:26:46 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/psy.c b/lib/psy.c
index 850c557a51b8bf2d4ca00211594ef35b9e85bd12..18dfaab1eda93fec5fc5afa60dfa493b2530686c 100644 (file)
--- a/lib/psy.c
+++ b/lib/psy.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: random psychoacoustics (not including preecho)
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Oct 15 1999
+ last mod: $Id: psy.c,v 1.7 1999/12/30 07:26:47 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/psy.h b/lib/psy.h
index 3961d8182acb2a9aa342eedd8adeec565f00c9a8..b17c4c76ab904ed4ec61fee59ce200ea2e43881b 100644 (file)
--- a/lib/psy.h
+++ b/lib/psy.h
@@ -5,14 +5,15 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: random psychoacoustics (not including preecho)
- 
+ last mod: $Id: psy.h,v 1.4 1999/12/30 07:26:48 xiphmont Exp $
+
  ********************************************************************/
 
 #ifndef _V_PSY_H_

diff --git a/lib/smallft.c b/lib/smallft.c
index cd423758227d3320cb659ab9bfc3af32e5209911..278948a99ad120d75c72ea883c4f2ea0b53a4c74 100644 (file)
--- a/lib/smallft.c
+++ b/lib/smallft.c
@@ -1,8 +1,22 @@
-/******************************************************************
- * CopyPolicy: GNU Public License 2 applies
- * Copyright (C) 1998 Monty xiphmont@mit.edu, monty@xiph.org
- *
- * FFT implementation from OggSquish, minus cosine transforms,
+/********************************************************************
+ *                                                                  *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE.  *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
+ * PLEASE READ THESE TERMS DISTRIBUTING.                            *
+ *                                                                  *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
+ * http://www.xiph.org/                                             *
+ *                                                                  *
+ ********************************************************************
+
+ function: fft transform
+ last mod: $Id: smallft.c,v 1.6 1999/12/30 07:26:49 xiphmont Exp $
+
+********************************************************************/
+
+/* FFT implementation from OggSquish, minus cosine transforms,
  * minus all but radix 2/4 case.  In Vorbis we only need this
  * cut-down version.
  *
@@ -13,8 +27,7 @@
  * packing following R_0, I_n, R_1, I_1, R_2, I_2 ... R_n-1, I_n-1,
  * it follows R_0, R_1, I_1, R_2, I_2 ... R_n-1, I_n-1, I_n like the
  * FORTRAN version
- *
- ******************************************************************/
+ */
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/lib/smallft.h b/lib/smallft.h
index b6ca5445d7262b68a017ef4e57f5fd900db72e04..2142f868b574092bee9f067e07d47083e4eb8d52 100644 (file)
--- a/lib/smallft.h
+++ b/lib/smallft.h
@@ -1,10 +1,20 @@
-/******************************************************************
- * CopyPolicy: GNU Public License 2 applies
- * Copyright (C) 1998-1999 Monty xiphmont@mit.edu, monty@xiph.org
- *
- * Stripped down FFT implementation from OggSquish.
- *
- ******************************************************************/
+/********************************************************************
+ *                                                                  *
+ * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE.  *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
+ * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
+ * PLEASE READ THESE TERMS DISTRIBUTING.                            *
+ *                                                                  *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
+ * http://www.xiph.org/                                             *
+ *                                                                  *
+ ********************************************************************
+
+ function: fft transform
+ last mod: $Id: smallft.h,v 1.4 1999/12/30 07:26:50 xiphmont Exp $
+
+********************************************************************/
 
 #ifndef _V_SMFT_H_
 #define _V_SMFT_H_

diff --git a/lib/spectrum.c b/lib/spectrum.c
index 91f0bfa9bb5fc0cc2fbad67e13bfe4b6dea007fc..d0eb5b0142cd65761d63805733a287d1ecbfb345 100644 (file)
--- a/lib/spectrum.c
+++ b/lib/spectrum.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: spectrum envelope and residue code/decode
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Nov 16 1999
+ last mod: $Id: spectrum.c,v 1.7 1999/12/30 07:26:51 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/spectrum.h b/lib/spectrum.h
index a602062c626f0d2eda3206c6079fa4430c6e92e1..39a611cd33d986494469eac0f72b18df03789f5b 100644 (file)
--- a/lib/spectrum.h
+++ b/lib/spectrum.h
@@ -5,10 +5,15 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
+ ********************************************************************
+
+ function: spectrum envelope and residue code/decode
+ last mod: $Id: spectrum.h,v 1.3 1999/12/30 07:26:52 xiphmont Exp $
+
  ********************************************************************/
 
 #ifndef _V_SPECT_H_

diff --git a/lib/synthesis.c b/lib/synthesis.c
index 9f114b279d80114307a8b29abf3166639b883677..5236b5283941144bba9a895ded1a0756d36a98c5 100644 (file)
--- a/lib/synthesis.c
+++ b/lib/synthesis.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: single-block PCM synthesis
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Oct 07 1999
+ last mod: $Id: synthesis.c,v 1.10 1999/12/30 07:26:53 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/vorbisfile.c b/lib/vorbisfile.c
index a4f168926d6984281e98bf6a44d8cae9d2088921..b756f7ad54a688af85feb9c609c33f999abb7186 100644 (file)
--- a/lib/vorbisfile.c
+++ b/lib/vorbisfile.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: stdio-based convenience library for opening/seeking/decoding
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Nov 16 1999
+ last mod: $Id: vorbisfile.c,v 1.11 1999/12/30 07:26:54 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/window.c b/lib/window.c
index 9dd08ab62026d71e61ddd3b8864e52688b356a6f..ed2dc251824131a9882f13224b5487ae646a2fb9 100644 (file)
--- a/lib/window.c
+++ b/lib/window.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: window functions
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Nov 16 1999
+ last mod: $Id: window.c,v 1.3 1999/12/30 07:26:55 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/window.h b/lib/window.h
index 644240168b550c12c97a319daf13af8524e4abba..e76961ca52112ed7462dcb8ab5960b232715d1d3 100644 (file)
--- a/lib/window.h
+++ b/lib/window.h
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: window functions
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Jul 27 1999
+ last mod: $Id: window.h,v 1.2 1999/12/30 07:26:56 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/lib/xlogmap.h b/lib/xlogmap.h
index f845b1f3684ac199a112e55dfd453e23a3afa16a..823d5f094bd8e4435c6196472bb70400b314bc0a 100644 (file)
--- a/lib/xlogmap.h
+++ b/lib/xlogmap.h
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
-  function: linear x scale -> log x scale mappings (with bias)
-  author: Monty <monty@xiph.org>
-  modifications by: Monty
-  last modification date: Aug 18 1999
+ function: linear x scale -> log x scale mappings (with bias)
+ last mod: $Id: xlogmap.h,v 1.2 1999/12/30 07:26:57 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/vq/Makefile.in b/vq/Makefile.in
index 5833cbf291f2069e1838b6f0198ff0b853a60bba..2fc556f8f8b27009a846bb505f2a0af5151e9636 100644 (file)
--- a/vq/Makefile.in
+++ b/vq/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.3 1999/12/28 03:41:52 xiphmont Exp $
+# $Id: Makefile.in,v 1.4 1999/12/30 07:26:58 xiphmont Exp $
 
 ###############################################################################
 #                                                                             #
@@ -57,3 +57,6 @@ $(OFILES):    $(HFILES)
 clean:
        -rm -f *.o *.a test* *~ *.out *.m config.* \
                lspvqtrain
+
+distclean:     clean
+       -rm -f Makefile

diff --git a/vq/build.c b/vq/build.c
index d23c9aa89859a0739e2ee88da18fe147dde5ae23..a7f5e93b5fb9b1fe2c2fcbb5d1cb7b0b0aec7835 100644 (file)
--- a/vq/build.c
+++ b/vq/build.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: utility main for building codebooks from training sets
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Dec 15 1999
+ last mod: $Id: build.c,v 1.7 1999/12/30 07:26:59 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/vq/lspdata.c b/vq/lspdata.c
index 2d2dda31f1f2c18a7b6102082a9b5599ff8897a8..75785ad52a5919cb7bd5ec0ebbf087dfacbffbef 100644 (file)
--- a/vq/lspdata.c
+++ b/vq/lspdata.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: metrics and quantization code for LSP VQ codebooks
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Dec 24 1999
+ last mod: $Id: lspdata.c,v 1.7 1999/12/30 07:27:00 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/vq/run.c b/vq/run.c
index 2c33edb1f091eb90ca1a4132d705ba2e7e12e39c..ee9e3f30f69eb9a46558c8ed915e73efeba66244 100644 (file)
--- a/vq/run.c
+++ b/vq/run.c
@@ -1,6 +1,3 @@
-#include "lsp16.vqh"
-#define CODEBOOK _vq_book_lsp16
-
 /********************************************************************
  *                                                                  *
  * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE.  *
@@ -8,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: utility main for loading/testing/running finished codebooks
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Dec 28 1999
+ last mod: $Id: run.c,v 1.2 1999/12/30 07:27:01 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/vq/train.c b/vq/train.c
index 04ccf09e769ecaa97744dd1fc14dd1b5adc466b9..bf63f134d4450285324d345fc55a4d6edfc98eea 100644 (file)
--- a/vq/train.c
+++ b/vq/train.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: utility main for training codebooks
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Dec 23 1999
+ last mod: $Id: train.c,v 1.11 1999/12/30 07:27:02 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/vq/vqext.h b/vq/vqext.h
index 445a7e7a493521593e760206679f6931d6226312..c370d16e69d45ed72342f4e863f22134370890e7 100644 (file)
--- a/vq/vqext.h
+++ b/vq/vqext.h
@@ -5,13 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
  function: prototypes for extermal metrics specific to data type
+ last mod: $Id: vqext.h,v 1.6 1999/12/30 07:27:03 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/vq/vqgen.c b/vq/vqgen.c
index af61c996c7592d98aeebb69cee435474e1720e73..942544187120cd0af678d5453504398616085114 100644 (file)
--- a/vq/vqgen.c
+++ b/vq/vqgen.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
- function: build a VQ codebook 
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Dec 27 1999
+ function: train a VQ codebook 
+ last mod: $Id: vqgen.c,v 1.25 1999/12/30 07:27:04 xiphmont Exp $
 
  ********************************************************************/
 

diff --git a/vq/vqgen.h b/vq/vqgen.h
index bbc942ee20813f3eecbcd925f4f373700fa9be94..7f2a478b90c0bafd8b15945cbf0a17c614f006bc 100644 (file)
--- a/vq/vqgen.h
+++ b/vq/vqgen.h
@@ -5,10 +5,15 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
+ ********************************************************************
+
+ function: build a VQ codebook 
+ last mod: $Id: vqgen.h,v 1.8 1999/12/30 07:27:05 xiphmont Exp $
+
  ********************************************************************/
 
 #ifndef _VQGEN_H_

diff --git a/vq/vqsplit.c b/vq/vqsplit.c
index 99a891d813a48e02adc759de6f363d85eb534351..3f3ab46055c620a48064506b72dc80f098455fea 100644 (file)
--- a/vq/vqsplit.c
+++ b/vq/vqsplit.c
@@ -5,16 +5,14 @@
  * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
  * PLEASE READ THESE TERMS DISTRIBUTING.                            *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-1999             *
- * by 1999 Monty <monty@xiph.org> and The XIPHOPHORUS Company       *
+ * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
+ * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
  * http://www.xiph.org/                                             *
  *                                                                  *
  ********************************************************************
 
- function: build a VQ codebook 
- author: Monty <xiphmont@mit.edu>
- modifications by: Monty
- last modification date: Dec 10 1999
+ function: build a VQ codebook and the encoding decision 'tree'
+ last mod: $Id: vqsplit.c,v 1.7 1999/12/30 07:27:06 xiphmont Exp $
 
  ********************************************************************/