Mercurial > mplayer.hg

diff cfg-mencoder.h @ 20054:8760c8681eac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove the x264 option parser, and pass the options on to libx264 as a string instead. This provides automatic support for all current and future x264 options. A few options had to be reorganized: partitions, deblockalpha/beta, me, direct_pred.
author lorenm
date Thu, 05 Oct 2006 02:03:10 +0000
parents 02a18c52a42a
children eaaf13b39595
line wrap: on
line diff
--- a/cfg-mencoder.h	Thu Oct 05 00:57:48 2006 +0000
+++ b/cfg-mencoder.h	Thu Oct 05 02:03:10 2006 +0000
@@ -43,7 +43,7 @@
 #endif
 
 #if defined(HAVE_X264)
-extern m_option_t x264encopts_conf[];
+extern char *x264encopts;
 #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, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
+	{"x264encopts", &x264encopts, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
 #endif
 
 	{"nuvopts",  nuvopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},