From 34a5cd1be85ad4408382abc2da33041d0246bece Mon Sep 17 00:00:00 2001 From: lorenm Date: Sun, 15 Oct 2006 23:11:36 +0000 Subject: fix multiple instances of -x264encopts on the commandline (broke in r20060) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20258 b3059339-0415-0410-9bf9-f77b7e298cf2 --- cfg-mencoder.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cfg-mencoder.h') diff --git a/cfg-mencoder.h b/cfg-mencoder.h index a710e9a1bc..660b44d734 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -43,7 +43,7 @@ extern m_option_t xvidencopts_conf[]; #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 @@ m_option_t mencoder_opts[]={ {"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}, -- cgit v1.2.3