[MPlayer-cvslog] r32116 - in trunk: gui/interface.c gui/win32/dialogs.c mpcommon.h mplayer.h

[diego]

Author: diego
Date: Thu Sep  9 18:17:27 2010
New Revision: 32116

Log:
Move **sub_name extern declaration to mpcommon.h.
It is used in both mplayer.c/mencoder.c.

Modified:
   trunk/gui/interface.c
   trunk/gui/win32/dialogs.c
   trunk/mpcommon.h
   trunk/mplayer.h

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Thu Sep  9 17:46:25 2010	(r32115)
+++ trunk/gui/interface.c	Thu Sep  9 18:17:27 2010	(r32116)
@@ -38,6 +38,7 @@
 #include "help_mp.h"
 #include "path.h"
 #include "mp_core.h"
+#include "mpcommon.h"
 #include "mplayer.h"
 #include "libmpcodecs/vd.h"
 #include "libmpcodecs/vf.h"

Modified: trunk/gui/win32/dialogs.c
==============================================================================
--- trunk/gui/win32/dialogs.c	Thu Sep  9 17:46:25 2010	(r32115)
+++ trunk/gui/win32/dialogs.c	Thu Sep  9 18:17:27 2010	(r32116)
@@ -27,7 +27,7 @@
 #include "gui/interface.h"
 #include "mp_msg.h"
 #include "help_mp.h"
-#include "mplayer.h"
+#include "mpcommon.h"
 #include "stream/stream.h"
 #include "libmpdemux/demuxer.h"
 #include "libmpdemux/stheader.h"

Modified: trunk/mpcommon.h
==============================================================================
--- trunk/mpcommon.h	Thu Sep  9 17:46:25 2010	(r32115)
+++ trunk/mpcommon.h	Thu Sep  9 18:17:27 2010	(r32116)
@@ -31,6 +31,7 @@ extern subtitle *vo_sub_last;
 
 extern float sub_delay;
 extern float sub_fps;
+extern char **sub_name;
 
 extern int disable_system_conf;
 extern int disable_user_conf;

Modified: trunk/mplayer.h
==============================================================================
--- trunk/mplayer.h	Thu Sep  9 17:46:25 2010	(r32115)
+++ trunk/mplayer.h	Thu Sep  9 18:17:27 2010	(r32116)
@@ -48,7 +48,6 @@ extern double start_pts;
 extern int frame_dropping;
 
 /* for the GUI */
-extern char **sub_name;
 extern int auto_quality;
 
 extern int audio_id;