diff options
| -rw-r--r-- | get_path.h | 6 | ||||
| -rw-r--r-- | mencoder.c | 4 | ||||
| -rw-r--r-- | mpcommon.c | 5 | ||||
| -rw-r--r-- | mpcommon.h | 4 | ||||
| -rw-r--r-- | mplayer.c | 4 |
5 files changed, 17 insertions, 6 deletions
diff --git a/get_path.h b/get_path.h index 759356e527..2f1909b601 100644 --- a/get_path.h +++ b/get_path.h @@ -24,10 +24,4 @@ char *get_path(const char *filename); void set_path_env(void); -#ifdef CONFIG_WIN32DLL -extern void SetCodecPath(const char *); // in loader/drv.c - -static char *codec_path=NULL; -#endif - #endif /* MPLAYER_GET_PATH_H */ diff --git a/mencoder.c b/mencoder.c index e98015a90b..9d4450f9ba 100644 --- a/mencoder.c +++ b/mencoder.c @@ -65,6 +65,10 @@ #include "mp_fifo.h" #include "get_path.h" +#ifdef CONFIG_WIN32DLL +#include "loader/drv.h" // for SetCodecPath() +#endif + #include "stream/stream.h" #include "libmpdemux/aviprint.h" #include "libmpdemux/demuxer.h" diff --git a/mpcommon.c b/mpcommon.c index bdc307baeb..90e2adbd84 100644 --- a/mpcommon.c +++ b/mpcommon.c @@ -313,3 +313,8 @@ const m_option_t noconfig_opts[] = { #endif /* CONFIG_GUI */ {NULL, NULL, 0, 0, 0, 0, NULL} }; + +#ifdef CONFIG_WIN32DLL +char *codec_path = NULL; +#endif + diff --git a/mpcommon.h b/mpcommon.h index 412225b104..a81aa8e1ba 100644 --- a/mpcommon.h +++ b/mpcommon.h @@ -37,4 +37,8 @@ void set_osd_subtitle(subtitle *subs); extern int disable_system_conf; extern int disable_user_conf; +#ifdef CONFIG_WIN32DLL +extern char *codec_path; +#endif + #endif /* MPLAYER_MPCOMMON_H */ @@ -95,6 +95,10 @@ #include "input/input.h" +#ifdef CONFIG_WIN32DLL +#include "loader/drv.h" // for SetCodecPath() +#endif + int slave_mode=0; int player_idle_mode=0; int quiet=0; |