From: Eric Petit <titer@videolan.org>
Date: Wed, 23 Aug 2006 23:32:29 +0000 (+0000)
Subject: BeOS / gcc 2.x fixes, patch by Cian Duffy
X-Git-Tag: 0.9.0-test0~10586
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=91c55963f699465df6109544d7f149b85d23fabe;p=vlc

BeOS / gcc 2.x fixes, patch by Cian Duffy
---

diff --git a/include/libvlc_internal.h b/include/libvlc_internal.h
index 6cbc8184ce..ebcce893b3 100644
--- a/include/libvlc_internal.h
+++ b/include/libvlc_internal.h
@@ -32,8 +32,10 @@ extern "C" {
 #include <vlc/vlc.h>
 
 #ifndef WIN32
+#ifndef __BEOS__
 #include <X11/Xlib.h>
 #endif
+#endif
     
 struct libvlc_instance_t
 {
diff --git a/modules/codec/ffmpeg/mux.c b/modules/codec/ffmpeg/mux.c
index ea0c5f7abc..7a948593ee 100644
--- a/modules/codec/ffmpeg/mux.c
+++ b/modules/codec/ffmpeg/mux.c
@@ -79,6 +79,7 @@ static offset_t IOSeek( void *opaque, offset_t offset, int whence );
  *****************************************************************************/
 int E_(OpenMux)( vlc_object_t *p_this )
 {
+    AVOutputFormat *file_oformat; 
     sout_mux_t *p_mux = (sout_mux_t*)p_this;
     sout_mux_sys_t *p_sys;
     AVFormatParameters params, *ap = &params;
@@ -87,7 +88,7 @@ int E_(OpenMux)( vlc_object_t *p_this )
     av_register_all();
 
     /* Find the requested muxer */
-    AVOutputFormat *file_oformat =
+    file_oformat =
         guess_format(NULL, p_mux->p_access->psz_name, NULL);
     if (!file_oformat)
     {
diff --git a/modules/demux/playlist/gvp.c b/modules/demux/playlist/gvp.c
index 8064cdea12..4a0b3496bd 100644
--- a/modules/demux/playlist/gvp.c
+++ b/modules/demux/playlist/gvp.c
@@ -100,13 +100,6 @@ static int Demux( demux_t *p_demux )
 {
     demux_sys_t *p_sys = p_demux->p_sys;
 
-    INIT_PLAYLIST_STUFF;
-
-    p_sys->p_playlist = p_playlist;
-    p_sys->p_current = p_current;
-    p_sys->i_parent_id = i_parent_id;
-    p_sys->p_item_in_category = p_item_in_category;
-
     char *psz_line;
     char *psz_attrvalue;
 
@@ -117,6 +110,13 @@ static int Demux( demux_t *p_demux )
     char *psz_title = NULL;
     char *psz_description = NULL;
 
+    INIT_PLAYLIST_STUFF;
+
+    p_sys->p_playlist = p_playlist;
+    p_sys->p_current = p_current;
+    p_sys->i_parent_id = i_parent_id;
+    p_sys->p_item_in_category = p_item_in_category;
+
     while( ( psz_line = stream_ReadLine( p_demux->s ) ) )
     {
         if( *psz_line == '#' )
diff --git a/modules/gui/beos/InterfaceWindow.cpp b/modules/gui/beos/InterfaceWindow.cpp
index 2c1c7c10c4..84b1db9881 100644
--- a/modules/gui/beos/InterfaceWindow.cpp
+++ b/modules/gui/beos/InterfaceWindow.cpp
@@ -321,14 +321,14 @@ InterfaceWindow::InterfaceWindow( intf_thread_t * _p_intf, BRect frame,
 
     /* Add the Show menu */
     fShowMenu = new BMenu( _("Window") );
+#if 0    
     ADD_ELLIPSIS( _("Playlist") );
     fShowMenu->AddItem( new BMenuItem( psz_tmp, new BMessage( OPEN_PLAYLIST ), 'P') );
+#endif
     ADD_ELLIPSIS( _("Messages") );
     fShowMenu->AddItem( new BMenuItem( psz_tmp, new BMessage( OPEN_MESSAGES ), 'M' ) );
-#if 0 
     ADD_ELLIPSIS( _("Preferences") );
     fShowMenu->AddItem( new BMenuItem( psz_tmp, new BMessage( OPEN_PREFERENCES ), 'S' ) );
-#endif
     fMenuBar->AddItem( fShowMenu );
 
     // add the media control view after the menubar is complete
diff --git a/src/playlist/item.c b/src/playlist/item.c
index edda2dc559..64127eb3de 100644
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -360,6 +360,8 @@ void playlist_NodeAddItem( playlist_t *p_playlist, playlist_item_t *p_item,
 playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist,
                                       playlist_item_t *p_item )
 {
+
+    playlist_item_t *p_item_in_category;
     /* What we do
      * Find the input in CATEGORY.
      *  - If we find it
@@ -379,7 +381,7 @@ playlist_item_t *playlist_ItemToNode( playlist_t *p_playlist,
         return p_item;
 
     /** \todo First look if we don't already have it */
-    playlist_item_t *p_item_in_category = playlist_ItemFindFromInputAndRoot(
+    p_item_in_category = playlist_ItemFindFromInputAndRoot(
                                             p_playlist, p_item->p_input->i_id,
                                             p_playlist->p_root_category );