[MPlayer-cvslog] r22262 - in trunk: cfg-mencoder.h libmpcodecs/Makefile libmpcodecs/ve.c

[diego]

Author: diego
Date: Sun Feb 18 20:28:47 2007
New Revision: 22262

Modified:
   trunk/cfg-mencoder.h
   trunk/libmpcodecs/Makefile
   trunk/libmpcodecs/ve.c

Log:
Make liblzo conditional to the appropriate #defines.


Modified: trunk/cfg-mencoder.h
==============================================================================
--- trunk/cfg-mencoder.h	(original)
+++ trunk/cfg-mencoder.h	Sun Feb 18 20:28:47 2007
@@ -46,7 +46,10 @@
 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 @@
 	"   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 @@
 	{"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},

Modified: trunk/libmpcodecs/Makefile
==============================================================================
--- trunk/libmpcodecs/Makefile	(original)
+++ trunk/libmpcodecs/Makefile	Sun Feb 18 20:28:47 2007
@@ -134,12 +134,12 @@
 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

Modified: trunk/libmpcodecs/ve.c
==============================================================================
--- trunk/libmpcodecs/ve.c	(original)
+++ trunk/libmpcodecs/ve.c	Sun Feb 18 20:28:47 2007
@@ -35,7 +35,9 @@
 #ifdef HAVE_XVID4
     &ve_info_xvid,
 #endif
+#ifdef USE_LIBLZO
     &ve_info_nuv,
+#endif
 #ifdef HAVE_X264
     &ve_info_x264,
 #endif