* modules/gui/wxwindows/streamout.cpp: disabled mp4 muxer.

* include/interface.h: updated comment.

diff --git a/include/interface.h b/include/interface.h
index f2480169436fa359d8bc442cba1baeed7fa10401..f6717d346e63ff59f0967c16b6743cfc0401d0b4 100644 (file)
--- a/include/interface.h
+++ b/include/interface.h
@@ -4,7 +4,7 @@
  * interface, such as message output.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: interface.h,v 1.40 2003/02/07 00:29:53 sam Exp $
+ * $Id: interface.h,v 1.41 2003/06/22 15:43:54 gbazin Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -72,7 +72,7 @@ VLC_EXPORT( void,              intf_Destroy,    ( intf_thread_t * ) );
          msg_Info( p_intf, _("\nWarning: if you can't access the GUI " \
                              "anymore, open a dos command box, go to the " \
                              "directory where you installed VLC and run " \
-                             "\"vlc -I win32\"\n") )
+                             "\"vlc -I wxwin\"\n") )
 #else
 #    define CONSOLE_INTRO_MSG
 #endif

diff --git a/modules/gui/wxwindows/streamout.cpp b/modules/gui/wxwindows/streamout.cpp
index 1260c5f164f9054e00da07fc19e992822edd2480..f941ed35eced1cee23150d9cb58cd34f297c6ea0 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.16 2003/06/03 22:18:58 gbazin Exp $
+ * $Id: streamout.cpp,v 1.17 2003/06/22 15:43:54 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -74,9 +74,9 @@ enum
     TS_ENCAPSULATION = 0,
     PS_ENCAPSULATION,
     AVI_ENCAPSULATION,
-    MP4_ENCAPSULATION,
     OGG_ENCAPSULATION,
-    ENCAPS_NUM
+    ENCAPS_NUM,
+    MP4_ENCAPSULATION
 };
 
 /*****************************************************************************
@@ -452,8 +452,8 @@ wxPanel *SoutDialog::EncapsulationPanel( wxWindow* parent )
         wxT("MPEG TS"),
         wxT("MPEG PS"),
         wxT("AVI"),
-        wxT("MP4/MOV"),
-        wxT("Ogg")
+        wxT("Ogg"),
+        wxT("MP4/MOV")
     };
 
     /* Stuff everything into the main panel */