updated skeleton.[h/c] from liboggz trunk, added AM_PROG_CC_C_O to configure.ac

git-svn-id: https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk@500 f606c939-3180-4ac9-a4b8-4b8779d57d0a

1 files changed, 11 insertions, 41 deletions

diff --git a/recordmydesktop/include/skeleton.h b/recordmydesktop/include/skeleton.h
index a563c1f..9805cdc 100644
--- a/recordmydesktop/include/skeleton.h
+++ b/recordmydesktop/include/skeleton.h
@@ -1,36 +1,7 @@
-/******************************************************************************
-*                                skeleton.h                                   *
-*                          author: Tahseen Mohammad                           *
-*******************************************************************************
-*   Redistribution and use in source and binary forms, with or without        *
-*   modification, are permitted provided that the following conditions        *
-*   are met:                                                                  *
-*                                                                             *
-*   - Redistributions of source code must retain the above copyright          *
-*   notice, this list of conditions and the following disclaimer.             *
-*                                                                             * 
-*   - Redistributions in binary form must reproduce the above copyright       *
-*   notice, this list of conditions and the following disclaimer in the       *
-*   documentation and/or other materials provided with the distribution.      *
-*                                                                             *
-*   - Neither the name of the Xiph.org Foundation nor the names of its        *
-*   contributors may be used to endorse or promote products derived from      *
-*   this software without specific prior written permission.                  *
-*                                                                             *
-*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS       *
-*   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT       *
-*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR     *
-*   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR *
-*   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,     *
-*   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,       *
-*   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR        *
-*   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF    *
-*   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING      *
-*   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS        *
-*   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              *
-******************************************************************************/
-
-
+/*
+ * skeleton.h
+ * author: Tahseen Mohammad
+ */
 
 #ifndef _SKELETON_H
 #define _SKELETON_H
@@ -39,10 +10,6 @@
 extern "C" {
 #endif
 
-#ifdef WIN32
-#define snprintf _snprintf
-#endif
-
 #include <ogg/ogg.h>
 
 #define SKELETON_VERSION_MAJOR 3
@@ -85,10 +52,13 @@ typedef struct {
 extern int write_ogg_page_to_file(ogg_page *og, FILE *out);
 extern int add_message_header_field(fisbone_packet *fp, char *header_key, char *header_value);
 /* remember to deallocate the returned ogg_packet properly */
-extern ogg_packet ogg_from_fishead(fishead_packet *fp);
-extern ogg_packet ogg_from_fisbone(fisbone_packet *fp);
-extern fishead_packet fishead_from_ogg(ogg_packet *op);
-extern fisbone_packet fisbone_from_ogg(ogg_packet *op);
+extern int ogg_from_fishead(fishead_packet *fp,ogg_packet *op);
+extern int ogg_from_fisbone(fisbone_packet *fp,ogg_packet *op);
+extern int fisbone_clear(fisbone_packet *fp);
+extern int fishead_from_ogg(ogg_packet *op,fishead_packet *fp);
+extern int fisbone_from_ogg(ogg_packet *op,fisbone_packet *fp);
+extern int fishead_from_ogg_page(const ogg_page *og,fishead_packet *fp);
+extern int fisbone_from_ogg_page(const ogg_page *og,fisbone_packet *fp);
 extern int add_fishead_to_stream(ogg_stream_state *os, fishead_packet *fp);
 extern int add_fisbone_to_stream(ogg_stream_state *os, fisbone_packet *fp);
 extern int add_eos_packet_to_stream(ogg_stream_state *os);