Mercurial > mplayer.hg

changeset 30855:977fd535cc9d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add -codecpath option. It allows to search binary codecs in non-standard directories.
author komh
date Mon, 15 Mar 2010 08:30:06 +0000
parents 0651155480a5
children 69fd6c17139a
files DOCS/man/en/mplayer.1 cfg-common-opts.h get_path.h mencoder.c mplayer.c
diffstat 5 files changed, 23 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1	Mon Mar 15 06:39:21 2010 +0000
+++ b/DOCS/man/en/mplayer.1	Mon Mar 15 08:30:06 2010 +0000
@@ -754,6 +754,10 @@
 .RE
 .
 .TP
+.B \-codecpath <dir>
+Specify a directory for binary codecs.
+.
+.TP
 .B \-profile <profile1,profile2,...>
 Use the given profile(s), \-profile help displays a list of the defined profiles.
 .
--- a/cfg-common-opts.h	Mon Mar 15 06:39:21 2010 +0000
+++ b/cfg-common-opts.h	Mon Mar 15 08:30:06 2010 +0000
@@ -40,6 +40,9 @@
 #ifdef CONFIG_PRIORITY
 	{"priority", &proc_priority, CONF_TYPE_STRING, 0, 0, 0, NULL},
 #endif
+#ifdef CONFIG_WIN32DLL
+	{"codecpath", &codec_path, CONF_TYPE_STRING, 0, 0, 0, NULL},
+#endif
 	{"noconfig", noconfig_opts, CONF_TYPE_SUBCONFIG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 0, NULL},
 
 // ------------------------- stream options --------------------
--- a/get_path.h	Mon Mar 15 06:39:21 2010 +0000
+++ b/get_path.h	Mon Mar 15 08:30:06 2010 +0000
@@ -24,4 +24,10 @@
 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	Mon Mar 15 06:39:21 2010 +0000
+++ b/mencoder.c	Mon Mar 15 08:30:06 2010 +0000
@@ -534,6 +534,11 @@
   set_priority();
 #endif
 
+#ifdef CONFIG_WIN32DLL
+  if (codec_path)
+    SetCodecPath(codec_path);
+#endif
+
 // check font
 #ifdef CONFIG_FREETYPE
   init_freetype();
--- a/mplayer.c	Mon Mar 15 06:39:21 2010 +0000
+++ b/mplayer.c	Mon Mar 15 08:30:06 2010 +0000
@@ -2701,6 +2701,11 @@
     set_priority();
 #endif
 
+#ifdef CONFIG_WIN32DLL
+  if (codec_path)
+    SetCodecPath(codec_path);
+#endif
+
 #ifndef CONFIG_GUI
     if(use_gui){
       mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoGui);