diff options
| author | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-08-27 20:43:05 +0000 |
|---|---|---|
| committer | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-08-27 20:43:05 +0000 |
| commit | 6379fb900a4070035ed1de4052cd0d92cd7a92da (patch) | |
| tree | 9ea72915c285427f084405a90c5700a24f889dcd /cfg-mencoder.h | |
| parent | 8596930cc0cd6fa694ee737e15e3f5b9e4165681 (diff) | |
| download | mpv-6379fb900a4070035ed1de4052cd0d92cd7a92da.tar.bz2 mpv-6379fb900a4070035ed1de4052cd0d92cd7a92da.tar.xz | |
x264 encoder support. Original patch send by Bernhard Rosenkraenzer <bero at arklinux dot org>, modifications by Loren Merritt <lorenm at u.washington dot edu>, Jeff Clagg <snacky at ikaruga.co dot uk> and me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13167 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-mencoder.h')
| -rw-r--r-- | cfg-mencoder.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/cfg-mencoder.h b/cfg-mencoder.h index cc4260b147..0d158f9b3a 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -63,6 +63,10 @@ extern m_option_t vfwopts_conf[]; extern m_option_t xvidencopts_conf[]; #endif +#if defined(HAVE_X264) +extern m_option_t x264encopts_conf[]; +#endif + extern m_option_t nuvopts_conf[]; m_option_t ovc_conf[]={ @@ -78,6 +82,7 @@ m_option_t ovc_conf[]={ {"xvid", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_XVID, NULL}, {"qtvideo", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_QTVIDEO, NULL}, {"nuv", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_NUV, NULL}, + {"x264", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_X264, NULL}, {"help", "\nAvailable codecs:\n" " copy - frame copy, without re-encoding. Doesn't work with filters.\n" " frameno - special audio-only file for 3-pass encoding, see DOCS.\n" @@ -103,6 +108,9 @@ m_option_t ovc_conf[]={ #if defined(HAVE_XVID3) || defined(HAVE_XVID4) " xvid - XviD encoding\n" #endif +#ifdef HAVE_X264 + " x264 - H.264 encoding\n" +#endif "\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} }; @@ -239,6 +247,9 @@ m_option_t mencoder_opts[]={ #if defined(HAVE_XVID3) || defined(HAVE_XVID4) {"xvidencopts", xvidencopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #endif +#if defined(HAVE_X264) + {"x264encopts", x264encopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, +#endif {"nuvopts", nuvopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, |