Mercurial > mplayer.hg

changeset 30872:eb1b97313903

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author komh
date Wed, 17 Mar 2010 09:12:51 +0000
parents 24a1c1f79296
children b193ab2083ad
files get_path.h mencoder.c mpcommon.c mpcommon.h mplayer.c
diffstat 5 files changed, 17 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/get_path.h	Tue Mar 16 22:08:56 2010 +0000
+++ b/get_path.h	Wed Mar 17 09:12:51 2010 +0000
@@ -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 */
--- a/mencoder.c	Tue Mar 16 22:08:56 2010 +0000
+++ b/mencoder.c	Wed Mar 17 09:12:51 2010 +0000
@@ -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"
--- a/mpcommon.c	Tue Mar 16 22:08:56 2010 +0000
+++ b/mpcommon.c	Wed Mar 17 09:12:51 2010 +0000
@@ -313,3 +313,8 @@
 #endif /* CONFIG_GUI */
     {NULL, NULL, 0, 0, 0, 0, NULL}
 };
+
+#ifdef CONFIG_WIN32DLL
+char *codec_path = NULL;
+#endif
+
--- a/mpcommon.h	Tue Mar 16 22:08:56 2010 +0000
+++ b/mpcommon.h	Wed Mar 17 09:12:51 2010 +0000
@@ -37,4 +37,8 @@
 extern int disable_system_conf;
 extern int disable_user_conf;
 
+#ifdef CONFIG_WIN32DLL
+extern char *codec_path;
+#endif
+
 #endif /* MPLAYER_MPCOMMON_H */
--- a/mplayer.c	Tue Mar 16 22:08:56 2010 +0000
+++ b/mplayer.c	Wed Mar 17 09:12:51 2010 +0000
@@ -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;