# HG changeset patch
# User diego
# Date 1284049047 0
# Node ID 52b0385d2d7aa1a6d5a7b1bbb620deaa26cf0dab
# Parent  d1e3a6f7d48aa8a947722b998aaf098d0a472ec8
Move **sub_name extern declaration to mpcommon.h.
It is used in both mplayer.c/mencoder.c.

diff -r d1e3a6f7d48a -r 52b0385d2d7a gui/interface.c
--- a/gui/interface.c	Thu Sep 09 15:46:25 2010 +0000
+++ b/gui/interface.c	Thu Sep 09 16:17:27 2010 +0000
@@ -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"
diff -r d1e3a6f7d48a -r 52b0385d2d7a gui/win32/dialogs.c
--- a/gui/win32/dialogs.c	Thu Sep 09 15:46:25 2010 +0000
+++ b/gui/win32/dialogs.c	Thu Sep 09 16:17:27 2010 +0000
@@ -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"
diff -r d1e3a6f7d48a -r 52b0385d2d7a mpcommon.h
--- a/mpcommon.h	Thu Sep 09 15:46:25 2010 +0000
+++ b/mpcommon.h	Thu Sep 09 16:17:27 2010 +0000
@@ -31,6 +31,7 @@
 
 extern float sub_delay;
 extern float sub_fps;
+extern char **sub_name;
 
 extern int disable_system_conf;
 extern int disable_user_conf;
diff -r d1e3a6f7d48a -r 52b0385d2d7a mplayer.h
--- a/mplayer.h	Thu Sep 09 15:46:25 2010 +0000
+++ b/mplayer.h	Thu Sep 09 16:17:27 2010 +0000
@@ -48,7 +48,6 @@
 extern int frame_dropping;
 
 /* for the GUI */
-extern char **sub_name;
 extern int auto_quality;
 
 extern int audio_id;