Mercurial > mplayer.hg

comparison 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
comparison
equal deleted inserted replaced
20053:63979c96cca5 20054:8760c8681eac
41 #if defined(HAVE_XVID3) || defined(HAVE_XVID4) 41 #if defined(HAVE_XVID3) || defined(HAVE_XVID4)
42 extern m_option_t xvidencopts_conf[]; 42 extern m_option_t xvidencopts_conf[];
43 #endif 43 #endif
44 44
45 #if defined(HAVE_X264) 45 #if defined(HAVE_X264)
46 extern m_option_t x264encopts_conf[]; 46 extern char *x264encopts;
47 #endif 47 #endif
48 48
49 extern m_option_t nuvopts_conf[]; 49 extern m_option_t nuvopts_conf[];
50 extern m_option_t mpegopts_conf[]; 50 extern m_option_t mpegopts_conf[];
51 #if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO) 51 #if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
269 #endif 269 #endif
270 #if defined(HAVE_XVID3) || defined(HAVE_XVID4) 270 #if defined(HAVE_XVID3) || defined(HAVE_XVID4)
271 {"xvidencopts", xvidencopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, 271 {"xvidencopts", xvidencopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
272 #endif 272 #endif
273 #if defined(HAVE_X264) 273 #if defined(HAVE_X264)
274 {"x264encopts", x264encopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, 274 {"x264encopts", &x264encopts, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
275 #endif 275 #endif
276 276
277 {"nuvopts", nuvopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, 277 {"nuvopts", nuvopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
278 {"mpegopts", mpegopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, 278 {"mpegopts", mpegopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
279 #if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO) 279 #if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)