summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-02-18 19:28:47 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-02-18 19:28:47 +0000
commitc9232c4a62047f41c49733e8ead82e5be3d3db89 (patch)
tree078e005dd641d6604dd57cb0181fdd37c0364883 /libmpcodecs
parent7593a4d298e9bde8fdca07d898ab11d6f3aac9d2 (diff)
downloadmpv-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
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/Makefile2
-rw-r--r--libmpcodecs/ve.c2
2 files changed, 3 insertions, 1 deletions
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