From 11eeaf5005b64a49d7338303610a01d0b2d4f955 Mon Sep 17 00:00:00 2001
From: komh <komh@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 17 Mar 2010 09:12:51 +0000
Subject: [PATCH] Follow a more proper way to support -codecpath.

    1. Include loader/drv.h for SetCodecPath() instead of a declaration of it.

    2. Move codec_path from get_path.h to mpcommon.h and mpcommon.c.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30914 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 get_path.h | 6 ------
 mencoder.c | 4 ++++
 mpcommon.c | 5 +++++
 mpcommon.h | 4 ++++
 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 */
diff --git a/mplayer.c b/mplayer.c
index 77400a0ed0..cb9d276c3a 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -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;