BeOS & gcc 2.9x fixes

diff --git a/configure.ac b/configure.ac
index 40ae9a9ca3b8dfad5cd599e6e2364fa9f5623554..d977d86d291a9c91607ade267e6a84afe1ba8ece 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.133 2003/12/13 11:56:36 gbazin Exp $
+dnl $Id: configure.ac,v 1.134 2003/12/14 16:08:32 titer Exp $
 
 AC_INIT(vlc,0.7.0-test2)
 
@@ -162,6 +162,7 @@ case "${target_os}" in
     SYS=beos
     CFLAGS_save="${CFLAGS_save} -Wno-multichar"; CFLAGS="${CFLAGS_save}"
     CXXFLAGS_save="${CXXFLAGS_save} -Wno-multichar"; CXXFLAGS="${CXXFLAGS_save}"
+    AX_ADD_CXXFLAGS([beos],[])
     AX_ADD_LDFLAGS([vlc beos],[-lbe])
     AX_ADD_LDFLAGS([beos],[-lmedia -ltranslation -ltracker -lgame])
 

diff --git a/modules/codec/theora.c b/modules/codec/theora.c
index 9cf88858574987066b6a8bb039804c041c5ba43a..e5f4e3f2e29f733dbcf2d51e2e6fc6d679aca739 100644 (file)
--- a/modules/codec/theora.c
+++ b/modules/codec/theora.c
@@ -2,7 +2,7 @@
  * theora.c: theora decoder module making use of libtheora.
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: theora.c,v 1.19 2003/12/08 13:02:39 gbazin Exp $
+ * $Id: theora.c,v 1.20 2003/12/14 16:08:32 titer Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -533,6 +533,7 @@ static block_t *Headers( encoder_t *p_enc )
     {
         ogg_packet oggpackets;
         int i;
+        block_t *p_block;
 
         /* Ogg packet to block */
         for( i = 0; i < 3; i++ )
@@ -550,7 +551,7 @@ static block_t *Headers( encoder_t *p_enc )
                 break;
             }
 
-            block_t *p_block = block_New( p_enc, oggpackets.bytes );
+            p_block = block_New( p_enc, oggpackets.bytes );
             memcpy( p_block->p_buffer, oggpackets.packet, oggpackets.bytes );
             p_block->i_dts = p_block->i_pts = p_block->i_length = 0;
             block_ChainAppend( &p_chain, p_block );