Mercurial > mplayer.hg

diff cfg-mencoder.h @ 20252:eaaf13b39595

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix multiple instances of -x264encopts on the commandline (broke in r20060)
author lorenm
date Sun, 15 Oct 2006 23:11:36 +0000
parents 8760c8681eac
children 50584bb892c0
line wrap: on
line diff
--- a/cfg-mencoder.h	Sun Oct 15 21:27:15 2006 +0000
+++ b/cfg-mencoder.h	Sun Oct 15 23:11:36 2006 +0000
@@ -43,7 +43,7 @@
 #endif
 
 #if defined(HAVE_X264)
-extern char *x264encopts;
+extern int x264enc_set_param(m_option_t* opt, char* arg);
 #endif
 
 extern m_option_t nuvopts_conf[];
@@ -271,7 +271,7 @@
 	{"xvidencopts", xvidencopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 #endif
 #if defined(HAVE_X264)
-	{"x264encopts", &x264encopts, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
+	{"x264encopts", &x264enc_set_param, CONF_TYPE_FUNC_PARAM, CONF_GLOBAL, 0, 0, NULL},
 #endif
 
 	{"nuvopts",  nuvopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},