diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-23 21:00:52 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-23 21:00:52 +0200 |
commit | 66f6f9f0768de5b003fc1b0fa9b1ea428466308a (patch) | |
tree | 157b98be78b0cd1e99b3dd51979bc97792d11642 /mplayer.c | |
parent | ebb541c6553af10203b2c2f5bcead6118a44f5be (diff) | |
parent | 30aa2383cadb2f879e02dca9df293c01119a3111 (diff) | |
download | mpv-66f6f9f0768de5b003fc1b0fa9b1ea428466308a.tar.bz2 mpv-66f6f9f0768de5b003fc1b0fa9b1ea428466308a.tar.xz |
Merge svn changes up to r28712
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -2562,7 +2562,6 @@ int gui_no_filename=0; // Preparse the command line m_config_preparse_command_line(mpctx->mconfig,argc,argv); - print_version("MPlayer"); #if (defined(__MINGW32__) || defined(__CYGWIN__)) && defined(CONFIG_WIN32DLL) set_path_env(); #endif @@ -2610,6 +2609,8 @@ int gui_no_filename=0; } mpctx->key_fifo = mp_fifo_create(opts); + print_version("MPlayer"); + #if (defined(__MINGW32__) || defined(__CYGWIN__)) && defined(CONFIG_GUI) void *runningmplayer = FindWindow("MPlayer GUI for Windows", "MPlayer for Windows"); if(runningmplayer && mpctx->filename && use_gui){ |