* modules/access/v4l/v4l.c: fixed uninitialized variable.

* modules/gui/wxwindows/streamout.cpp: cosmetic change in the gui.

diff --git a/modules/access/v4l/v4l.c b/modules/access/v4l/v4l.c
index 0a430f3c35fe9c36906f830b6d184b04bf271c89..db6b650ea9ff48e23d5c4c415f03373c8990d071 100644 (file)
--- a/modules/access/v4l/v4l.c
+++ b/modules/access/v4l/v4l.c
@@ -2,7 +2,7 @@
  * v4l.c : Video4Linux input module for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: v4l.c,v 1.22 2003/08/29 18:58:49 fenrir Exp $
+ * $Id: v4l.c,v 1.23 2003/08/30 11:59:44 gbazin Exp $
  *
  * Author: Laurent Aimar <fenrir@via.ecp.fr>
  *         Paul Forgey <paulf at aphrodite dot com>
@@ -743,7 +743,7 @@ static int AccessOpen( vlc_object_t *p_this )
         /* Find out video format used by device */
         if( ioctl( p_sys->fd, VIDIOCGPICT, &p_sys->vid_picture ) == 0 )
         {
-            int i_chroma;
+            int i_chroma = VLC_FOURCC( ' ', ' ', ' ', ' ' );
             struct video_picture vid_picture = p_sys->vid_picture;
 
             /* Try to set the format to something easy to encode */

diff --git a/modules/gui/wxwindows/streamout.cpp b/modules/gui/wxwindows/streamout.cpp
index f3e821155d8ea1103321799b5cb85f7183a0cceb..95aa22fc2a6959eb0e8bde5737e12ed8c7a8aafe 100644 (file)
--- a/modules/gui/wxwindows/streamout.cpp
+++ b/modules/gui/wxwindows/streamout.cpp
@@ -2,7 +2,7 @@
  * streamout.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: streamout.cpp,v 1.30 2003/08/28 15:59:04 gbazin Exp $
+ * $Id: streamout.cpp,v 1.31 2003/08/30 11:59:44 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -477,25 +477,22 @@ wxPanel *SoutDialog::MiscPanel( wxWindow* parent )
     wxPanel *panel = new wxPanel( parent, -1, wxDefaultPosition,
                                   wxSize(200, 200) );
 
-    // wxFlexGridSizer *sizer = new wxFlexGridSizer( 2, 4, 20 );
     wxStaticBox *panel_box = new wxStaticBox( panel, -1,
                                    wxU(_("Miscellaneous Options")) );
     wxStaticBoxSizer *panel_sizer = new wxStaticBoxSizer( panel_box,
                                                           wxVERTICAL );
 
     /* Announce Row */
-    wxStaticText *label;
-    wxFlexGridSizer *subpanel_sizer;
-
     misc_subpanels[ANN_MISC_SOUT] = new wxPanel( panel, -1 );
-    subpanel_sizer = new wxFlexGridSizer( 2, 2, 20 );
+    wxFlexGridSizer *subpanel_sizer = new wxFlexGridSizer( 4, 4, 20 );
 
     sap_checkbox = new wxCheckBox( misc_subpanels[ANN_MISC_SOUT],SAPMisc_Event,
                                    wxU(_("SAP Announce")) );
     slp_checkbox = new wxCheckBox( misc_subpanels[ANN_MISC_SOUT],SLPMisc_Event,
                                    wxU(_("SLP Announce")) );
-    label = new wxStaticText( misc_subpanels[ANN_MISC_SOUT], -1,
-                              wxU(_("Channel Name ")) );
+
+    wxStaticText *label = new wxStaticText( misc_subpanels[ANN_MISC_SOUT], -1,
+                                            wxU(_("Channel Name")) );
     announce_addr = new wxTextCtrl( misc_subpanels[ANN_MISC_SOUT],
                                     AnnounceAddr_Event,
                                     wxT(""), wxDefaultPosition,