Mercurial > mplayer.hg
changeset 31424:283eac48391d
Move extern declarations for vf.c variables to vf.h.
| author | diego |
|---|---|
| date | Sun, 20 Jun 2010 15:38:38 +0000 |
| parents | 5416dfe4ba1c |
| children | 2392ad3cec9c |
| files | cfg-common.h gui/interface.c libmpcodecs/vf.h |
| diffstat | 3 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-common.h Sun Jun 20 15:32:14 2010 +0000 +++ b/cfg-common.h Sun Jun 20 15:38:38 2010 +0000 @@ -190,9 +190,6 @@ {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},
--- a/gui/interface.c Sun Jun 20 15:32:14 2010 +0000 +++ b/gui/interface.c Sun Jun 20 15:38:38 2010 +0000 @@ -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 @@ extern int stream_dump_type; extern int vcd_track; -extern m_obj_settings_t * vf_settings; void guiLoadFont( void ) {
--- a/libmpcodecs/vf.h Sun Jun 20 15:32:14 2010 +0000 +++ b/libmpcodecs/vf.h Sun Jun 20 15:38:38 2010 +0000 @@ -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;