From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sat, 13 Mar 2010 17:32:20 +0000 (+0200)
Subject: Print exact revision in addition to version number on console
X-Git-Tag: 1.1.0-pre1~388
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=3048882f57f5ec815fe21e1a803fddaff7a58f61

Print exact revision in addition to version number on console
---

diff --git a/bin/vlc.c b/bin/vlc.c
index 657b1be84b..182a7edc6c 100644
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -74,7 +74,8 @@ int main( int i_argc, const char *ppsz_argv[] )
 
 #ifndef __APPLE__
     /* This clutters OSX GUI error logs */
-    fprintf( stderr, "VLC media player %s\n", libvlc_get_version() );
+    fprintf( stderr, "VLC media player %s (revision %s)\n",
+             libvlc_get_version(), libvlc_get_changeset() );
 #endif
 
 #ifdef HAVE_PUTENV
diff --git a/src/libvlc.c b/src/libvlc.c
index 4166bb276c..38e2b8bbc6 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -217,6 +217,7 @@ static void PauseConsole  ( void );
 static int  ConsoleWidth  ( void );
 
 static vlc_mutex_t global_lock = VLC_STATIC_MUTEX;
+extern const char psz_vlc_changeset[];
 
 /**
  * Allocate a libvlc instance, initialize global data if needed
@@ -330,7 +331,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     /* Announce who we are - Do it only for first instance ? */
     msg_Dbg( p_libvlc, "VLC media player - %s", VERSION_MESSAGE );
     msg_Dbg( p_libvlc, "%s", COPYRIGHT_MESSAGE );
-    msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
+    msg_Dbg( p_libvlc, "revision %s", psz_vlc_changeset );
+    msg_Dbg( p_libvlc, "configured with %s", CONFIGURE_LINE );
     /*xgettext: Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
     msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") );
 
@@ -1902,7 +1904,6 @@ static void ListModules( libvlc_int_t *p_this, bool b_verbose )
  *****************************************************************************/
 static void Version( void )
 {
-    extern const char psz_vlc_changeset[];
 #ifdef WIN32
     ShowConsole( true );
 #endif