From c9232c4a62047f41c49733e8ead82e5be3d3db89 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 18 Feb 2007 19:28:47 +0000 Subject: Make liblzo conditional to the appropriate #defines. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22262 b3059339-0415-0410-9bf9-f77b7e298cf2 --- cfg-mencoder.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'cfg-mencoder.h') diff --git a/cfg-mencoder.h b/cfg-mencoder.h index f5c6dc494c..cebcf9b94c 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -46,7 +46,10 @@ extern m_option_t xvidencopts_conf[]; extern void x264enc_set_param(m_option_t* opt, char* arg); #endif +#ifdef USE_LIBLZO extern m_option_t nuvopts_conf[]; +#endif + extern m_option_t mpegopts_conf[]; #if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO) extern m_option_t lavfopts_conf[]; @@ -68,7 +71,9 @@ m_option_t ovc_conf[]={ " copy - frame copy, without re-encoding. Doesn't work with filters.\n" " frameno - special audio-only file for 3-pass encoding, see DOCS.\n" " raw - uncompressed video. Use fourcc option to set format explicitly.\n" +#ifdef USE_LIBLZO " nuv - nuppel video\n" +#endif #ifdef USE_LIBAVCODEC " lavc - libavcodec codecs - best quality!\n" #endif @@ -274,7 +279,9 @@ m_option_t mencoder_opts[]={ {"x264encopts", &x264enc_set_param, CONF_TYPE_FUNC_PARAM, CONF_GLOBAL, 0, 0, NULL}, #endif +#ifdef USE_LIBLZO {"nuvopts", nuvopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, +#endif {"mpegopts", mpegopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, #if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO) {"lavfopts", lavfopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, -- cgit v1.2.3