[MPlayer-cvslog] r31490 - in trunk: cfg-common.h gui/interface.c libmpcodecs/vf.h

[diego]

Author: diego
Date: Sun Jun 20 17:38:38 2010
New Revision: 31490

Log:
Move extern declarations for vf.c variables to vf.h.

Modified:
   trunk/cfg-common.h
   trunk/gui/interface.c
   trunk/libmpcodecs/vf.h

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Sun Jun 20 17:32:14 2010	(r31489)
+++ trunk/cfg-common.h	Sun Jun 20 17:38:38 2010	(r31490)
@@ -190,9 +190,6 @@ const m_option_t vivoopts_conf[]={
     {NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
-extern m_obj_settings_t* vf_settings;
-extern m_obj_list_t vf_obj_list;
-
 const m_option_t mfopts_conf[]={
     {"on", "-mf on has been removed, use mf:// instead.\n", CONF_TYPE_PRINT, 0, 0, 1, NULL},
     {"w", &mf_w, CONF_TYPE_INT, 0, 0, 0, NULL},

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Sun Jun 20 17:32:14 2010	(r31489)
+++ trunk/gui/interface.c	Sun Jun 20 17:38:38 2010	(r31490)
@@ -40,6 +40,7 @@
 #include "mp_core.h"
 #include "mplayer.h"
 #include "libmpcodecs/vd.h"
+#include "libmpcodecs/vf.h"
 #include "libvo/x11_common.h"
 #include "libvo/video_out.h"
 #include "libvo/font_load.h"
@@ -356,7 +357,6 @@ void guiDone( void )
 
 extern int              stream_dump_type;
 extern int  		vcd_track;
-extern m_obj_settings_t * vf_settings;
 
 void guiLoadFont( void )
 {

Modified: trunk/libmpcodecs/vf.h
==============================================================================
--- trunk/libmpcodecs/vf.h	Sun Jun 20 17:32:14 2010	(r31489)
+++ trunk/libmpcodecs/vf.h	Sun Jun 20 17:38:38 2010	(r31490)
@@ -19,8 +19,12 @@
 #ifndef MPLAYER_VF_H
 #define MPLAYER_VF_H
 
+#include "m_option.h"
 #include "mp_image.h"
 
+extern m_obj_settings_t* vf_settings;
+extern m_obj_list_t vf_obj_list;
+
 struct vf_instance;
 struct vf_priv_s;