Contribs - faac updated to 1.26, no patch needed.

[vlc] / src / libvlc-common.c

diff --git a/src/libvlc-common.c b/src/libvlc-common.c
index 61f2842b2292b21f789a9b0947e391d398c94a76..e00ad5a5e6d5343a02de7411804be40faaa9ad9b 100644 (file)
--- a/src/libvlc-common.c
+++ b/src/libvlc-common.c
@@ -198,20 +198,23 @@ libvlc_int_t * libvlc_InternalCreate( void )
 
     /* Initialize message queue */
     msg_Create( p_libvlc );
-    /* Announce who we are - Do it only for first instance ? */
-    msg_Dbg( p_libvlc, COPYRIGHT_MESSAGE );
-    msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
 
     /* Find verbosity from VLC_VERBOSE environment variable */
     psz_env = getenv( "VLC_VERBOSE" );
-    p_libvlc->i_verbose = psz_env ? atoi( psz_env ) : -1;
-
+    if( psz_env != NULL )
+        p_libvlc->i_verbose = atoi( psz_env );
+    else
+        p_libvlc->i_verbose = 3;
 #if defined( HAVE_ISATTY ) && !defined( WIN32 )
     p_libvlc->b_color = isatty( 2 ); /* 2 is for stderr */
 #else
     p_libvlc->b_color = VLC_FALSE;
 #endif
 
+    /* Announce who we are - Do it only for first instance ? */
+    msg_Dbg( p_libvlc, COPYRIGHT_MESSAGE );
+    msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
+
     /* Initialize mutexes */
     vlc_mutex_init( p_libvlc, &p_libvlc->config_lock );
 #ifdef __APPLE__
@@ -272,10 +275,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] )
     /*
      * Support for gettext
      */
-#ifdef HAVE_LC_MESSAGES
-    setlocale( LC_MESSAGES, "" );
-#endif
-    setlocale( LC_CTYPE, "" );
     LoadMessages ();
 
     /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */