diff options
| author | lorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-05 02:03:10 +0000 |
|---|---|---|
| committer | lorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-05 02:03:10 +0000 |
| commit | 0594cd07a09664f9af6340cedc2f0fe52e70aa61 (patch) | |
| tree | 553640041ef71776cb23b6004b06a8740fb1c0ef /cfg-mencoder.h | |
| parent | 1240e6bde5c194ac2c0090186b3d406b5eb55521 (diff) | |
| download | mpv-0594cd07a09664f9af6340cedc2f0fe52e70aa61.tar.bz2 mpv-0594cd07a09664f9af6340cedc2f0fe52e70aa61.tar.xz | |
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.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20060 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-mencoder.h')
| -rw-r--r-- | cfg-mencoder.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cfg-mencoder.h b/cfg-mencoder.h index 71248ad588..a710e9a1bc 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 m_option_t x264encopts_conf[]; +extern char *x264encopts; #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, 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}, |