diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-02-18 19:28:47 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-02-18 19:28:47 +0000 |
| commit | c9232c4a62047f41c49733e8ead82e5be3d3db89 (patch) | |
| tree | 078e005dd641d6604dd57cb0181fdd37c0364883 | |
| parent | 7593a4d298e9bde8fdca07d898ab11d6f3aac9d2 (diff) | |
| download | mpv-c9232c4a62047f41c49733e8ead82e5be3d3db89.tar.bz2 mpv-c9232c4a62047f41c49733e8ead82e5be3d3db89.tar.xz | |
Make liblzo conditional to the appropriate #defines.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22262 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | cfg-mencoder.h | 7 | ||||
| -rw-r--r-- | libmpcodecs/Makefile | 2 | ||||
| -rw-r--r-- | libmpcodecs/ve.c | 2 |
3 files changed, 10 insertions, 1 deletions
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}, diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile index 827c1ee563..45e81e60fd 100644 --- a/libmpcodecs/Makefile +++ b/libmpcodecs/Makefile @@ -134,12 +134,12 @@ SRCS-$(ZORAN) += vd_zrmjpeg.c vf_zrmjpeg.c SRCS2=ae.c \ ae_pcm.c \ ve.c \ - ve_nuv.c \ ve_raw.c \ SRCS2-$(CONFIG_LIBAVCODEC) += ae_lavc.c ve_lavc.c SRCS2-$(CONFIG_LIBAVCODEC_SO) += ae_lavc.c ve_lavc.c SRCS2-$(LIBDV) += ve_libdv.c +SRCS2-$(LIBLZO) += ve_nuv.c SRCS2-$(QTX_CODECS) += ve_qtvideo.c SRCS2-$(WIN32DLL) += ve_vfw.c SRCS2-$(X264) += ve_x264.c diff --git a/libmpcodecs/ve.c b/libmpcodecs/ve.c index 8d258d5fa5..c8b1c159a2 100644 --- a/libmpcodecs/ve.c +++ b/libmpcodecs/ve.c @@ -35,7 +35,9 @@ static vf_info_t* encoder_list[]={ #ifdef HAVE_XVID4 &ve_info_xvid, #endif +#ifdef USE_LIBLZO &ve_info_nuv, +#endif #ifdef HAVE_X264 &ve_info_x264, #endif |