[xiph-commits] r7196 - in trunk/ogg2: . debian include/ogg2 src
arc at dactyl.lonelymoon.com
arc
Tue Jul 20 15:20:58 PDT 2004
Author: arc
Date: Tue Jul 20 15:20:58 2004
New Revision: 7196
Modified:
trunk/ogg2/HACKING
trunk/ogg2/README
trunk/ogg2/autogen.sh
trunk/ogg2/debian/rules
trunk/ogg2/include/ogg2/mutex.c
trunk/ogg2/include/ogg2/ogg.h
trunk/ogg2/include/ogg2/os_types.h
trunk/ogg2/src/bitwise.c
trunk/ogg2/src/buffer.c
trunk/ogg2/src/bytewise.c
trunk/ogg2/src/mutex.h
trunk/ogg2/src/ogginternal.h
trunk/ogg2/src/stream.c
trunk/ogg2/src/sync.c
Log:
Sorry, Monty.. still learning SVN. This was suppost to go to my branch.
This should completely undo the last commit, according to
http://svnbook.red-bean.com/svnbook/ch04s04.html#svn-ch-4-sect-4.2
Modified: trunk/ogg2/HACKING
===================================================================
--- trunk/ogg2/HACKING 2004-07-20 22:11:32 UTC (rev 7195)
+++ trunk/ogg2/HACKING 2004-07-20 22:20:56 UTC (rev 7196)
@@ -1,22 +1,22 @@
Note that these instructions are *not* necessary for distribution
tarballs; they have separate configure/build instructions.
-Building this package from SVN is mainly intended for developers.
+Building this package from CVS is mainly intended for developers.
General users should obtain official distribution packages; both
source and binary distributions are available at
http://www.vorbis.com/.
-----
-These are *brief* instructions on how to build this package from SVN.
+These are *brief* instructions on how to build this package from CVS.
Yes, there are details left out.
-There are generally four steps necessary when building from SVN (i.e.,
+There are generally four steps necessary when building from CVS (i.e.,
a developer's copy):
-1. SVN checkout of the sources, or SVN update. RTFM from your
- favorite flavor of SVN documentation; information on the xiph.org
- SVN repository can be found at http://svn.xiph.org/
+1. cvs checkout of the sources, or cvs update. RTFM from your
+ favorite flavor of CVS documentation; information on the xiph.org
+ CVS repository can be found at http://www.xiph.org/cvs.html.
2. [re-]generate files such as "configure" and "Makefile.in" with the
GNU autoconf/automake tools. Run the "autogen.sh" script to
@@ -37,7 +37,7 @@
4. Run "make" to build the source.
In general, steps 2 and 3 need to be re-run every time any of the
-following files are modified (either manually or by a SVN update):
+following files are modified (either manually or by a cvs update):
configure.in
acinclude.m4
Modified: trunk/ogg2/README
===================================================================
--- trunk/ogg2/README 2004-07-20 22:11:32 UTC (rev 7195)
+++ trunk/ogg2/README 2004-07-20 22:20:56 UTC (rev 7196)
@@ -1,14 +1,14 @@
- ********************************************************************
- * *
- * THIS FILE IS PART OF THE Ogg Reference Library SOURCE CODE. *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
- * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
- * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
- * *
- * THE Ogg Reference Library SOURCE CODE IS (C) COPYRIGHT 1994-2004 *
- * by the Xiph.Org Foundation http://www.xiph.org/ *
- * *
- ********************************************************************
+********************************************************************
+* *
+* THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
+* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+* *
+* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2003 *
+* by the Xiph.Org Foundation http://www.xiph.org/ *
+* *
+********************************************************************
WHAT'S HERE:
@@ -45,9 +45,9 @@
Up to date technical documents, contact information, source code and
pre-built utilities may be found there.
-BUILDING FROM SVN:
+BUILDING FROM CVS:
-A standard svn build should consist of nothing more than:
+A standard cvs build should consist of nothing more than:
./autogen.sh
make
Modified: trunk/ogg2/autogen.sh
===================================================================
--- trunk/ogg2/autogen.sh 2004-07-20 22:11:32 UTC (rev 7195)
+++ trunk/ogg2/autogen.sh 2004-07-20 22:20:56 UTC (rev 7196)
@@ -1,6 +1,6 @@
#!/bin/sh
# Run this to set up the build system: configure, makefiles, etc.
-# (based on the version in enlightenment's svn)
+# (based on the version in enlightenment's cvs)
package="libogg"
Modified: trunk/ogg2/debian/rules
===================================================================
--- trunk/ogg2/debian/rules 2004-07-20 22:11:32 UTC (rev 7195)
+++ trunk/ogg2/debian/rules 2004-07-20 22:20:56 UTC (rev 7196)
@@ -33,7 +33,7 @@
mkdir $(objdir)
# run configure with build tree $(objdir)
- # change ../configure to ../autogen.sh for SVN build
+ # change ../configure to ../autogen.sh for CVS build
cd $(objdir) && \
../configure --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
--prefix=/usr
Modified: trunk/ogg2/include/ogg2/mutex.c
===================================================================
--- trunk/ogg2/include/ogg2/mutex.c 2004-07-20 22:11:32 UTC (rev 7195)
+++ trunk/ogg2/include/ogg2/mutex.c 2004-07-20 22:20:56 UTC (rev 7196)
@@ -1,11 +1,11 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Reference Library SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE Ogg Reference Library SOURCE CODE IS (C) COPYRIGHT 1994-2004 *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
Modified: trunk/ogg2/include/ogg2/ogg.h
===================================================================
--- trunk/ogg2/include/ogg2/ogg.h 2004-07-20 22:11:32 UTC (rev 7195)
+++ trunk/ogg2/include/ogg2/ogg.h 2004-07-20 22:20:56 UTC (rev 7196)
@@ -1,11 +1,11 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Reference Library SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE Ogg Reference Library SOURCE CODE IS (C) COPYRIGHT 1994-2004 *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2003 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
@@ -59,8 +59,7 @@
/* Ogg BITSTREAM PRIMITIVES: bitstream ************************/
-extern ogg_buffer_state *ogg_buffer_create(void);
-extern int oggpack_buffersize(void);
+ extern int oggpack_buffersize(void);
extern void oggpack_writeinit(oggpack_buffer *b,ogg_buffer_state *bs);
extern ogg_reference *oggpack_writebuffer(oggpack_buffer *b);
extern void oggpack_writealign(oggpack_buffer *b);
@@ -118,12 +117,14 @@
/* Ogg BITSTREAM PRIMITIVES: general ***************************/
-extern ogg_stream_state *ogg_stream_create(int serialno, int mode);
+extern ogg_stream_state *ogg_stream_create(int serialno);
extern int ogg_stream_destroy(ogg_stream_state *os);
extern int ogg_stream_reset(ogg_stream_state *os);
extern int ogg_stream_reset_serialno(ogg_stream_state *os,int serialno);
extern int ogg_stream_eos(ogg_stream_state *os);
+extern int ogg_page_checksum_set(ogg_page *og);
+
extern int ogg_page_version(ogg_page *og);
extern int ogg_page_continued(ogg_page *og);
extern int ogg_page_bos(ogg_page *og);
@@ -132,6 +133,7 @@
extern ogg_uint32_t ogg_page_serialno(ogg_page *og);
extern ogg_uint32_t ogg_page_pageno(ogg_page *og);
extern int ogg_page_packets(ogg_page *og);
+extern int ogg_page_getbuffer(ogg_page *og, unsigned char **buffer);
extern int ogg_packet_release(ogg_packet *op);
extern int ogg_page_release(ogg_page *og);
Modified: trunk/ogg2/include/ogg2/os_types.h
===================================================================
--- trunk/ogg2/include/ogg2/os_types.h 2004-07-20 22:11:32 UTC (rev 7195)
+++ trunk/ogg2/include/ogg2/os_types.h 2004-07-20 22:20:56 UTC (rev 7196)
@@ -1,11 +1,11 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Reference Library SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE Ogg Reference Library SOURCE CODE IS (C) COPYRIGHT 1994-2004 *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2003 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
Modified: trunk/ogg2/src/bitwise.c
===================================================================
--- trunk/ogg2/src/bitwise.c 2004-07-20 22:11:32 UTC (rev 7195)
+++ trunk/ogg2/src/bitwise.c 2004-07-20 22:20:56 UTC (rev 7196)
@@ -1,11 +1,11 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Reference Library SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE Ogg Reference Library SOURCE CODE IS (C) COPYRIGHT 1994-2004 *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2003 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
Modified: trunk/ogg2/src/buffer.c
===================================================================
--- trunk/ogg2/src/buffer.c 2004-07-20 22:11:32 UTC (rev 7195)
+++ trunk/ogg2/src/buffer.c 2004-07-20 22:20:56 UTC (rev 7196)
@@ -1,11 +1,11 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Reference Library SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE Ogg Reference Library SOURCE CODE IS (C) COPYRIGHT 1994-2004 *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2003 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
Modified: trunk/ogg2/src/bytewise.c
===================================================================
--- trunk/ogg2/src/bytewise.c 2004-07-20 22:11:32 UTC (rev 7195)
+++ trunk/ogg2/src/bytewise.c 2004-07-20 22:20:56 UTC (rev 7196)
@@ -1,11 +1,11 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Reference Library SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE Ogg Reference Library SOURCE CODE IS (C) COPYRIGHT 1994-2004 *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2003 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
Modified: trunk/ogg2/src/mutex.h
===================================================================
--- trunk/ogg2/src/mutex.h 2004-07-20 22:11:32 UTC (rev 7195)
+++ trunk/ogg2/src/mutex.h 2004-07-20 22:20:56 UTC (rev 7196)
@@ -1,11 +1,11 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Reference Library SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE Ogg Reference Library SOURCE CODE IS (C) COPYRIGHT 1994-2004 *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
Modified: trunk/ogg2/src/ogginternal.h
===================================================================
--- trunk/ogg2/src/ogginternal.h 2004-07-20 22:11:32 UTC (rev 7195)
+++ trunk/ogg2/src/ogginternal.h 2004-07-20 22:20:56 UTC (rev 7196)
@@ -1,11 +1,11 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Reference Library SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE Ogg Reference Library SOURCE CODE IS (C) COPYRIGHT 1994-2004 *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2003 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
@@ -115,7 +115,6 @@
(which is in a seperate abstraction
layer) also knows about the gap */
ogg_int64_t granulepos;
- int mode; /* 0 = continuous, 1 = discontinuous */
int lacing_fill;
ogg_uint32_t body_fill;
Modified: trunk/ogg2/src/stream.c
===================================================================
--- trunk/ogg2/src/stream.c 2004-07-20 22:11:32 UTC (rev 7195)
+++ trunk/ogg2/src/stream.c 2004-07-20 22:20:56 UTC (rev 7196)
@@ -1,11 +1,11 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Reference Library SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE Ogg Reference Library SOURCE CODE IS (C) COPYRIGHT 1994-2004 *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2003 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
@@ -23,11 +23,10 @@
/* A complete description of Ogg framing exists in docs/framing.html */
-ogg_stream_state *ogg_stream_create(int serialno, int mode){
+ogg_stream_state *ogg_stream_create(int serialno){
ogg_stream_state *os=_ogg_calloc(1,sizeof(*os));
os->watermark=4096;
os->serialno=serialno;
- os->mode=mode;
os->bufferpool=ogg_buffer_create();
return os;
}
@@ -1047,8 +1046,8 @@
int main(void){
- os_en=ogg_stream_create(0x04030201, 0);
- os_de=ogg_stream_create(0x04030201, 0);
+ os_en=ogg_stream_create(0x04030201);
+ os_de=ogg_stream_create(0x04030201);
oy=ogg_sync_create();
bs=ogg_buffer_create();
Modified: trunk/ogg2/src/sync.c
===================================================================
--- trunk/ogg2/src/sync.c 2004-07-20 22:11:32 UTC (rev 7195)
+++ trunk/ogg2/src/sync.c 2004-07-20 22:20:56 UTC (rev 7196)
@@ -1,11 +1,11 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE Ogg Reference Library SOURCE CODE. *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE Ogg Reference Library SOURCE CODE IS (C) COPYRIGHT 1994-2004 *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2003 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
@@ -99,7 +99,7 @@
return(count);
}
-/* Static CRC calculation table. See older code in SVN for dead
+/* Static CRC calculation table. See older code in CVS for dead
run-time initialization code. */
static ogg_uint32_t crc_lookup[256]={
More information about the commits
mailing list