summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-02-18 14:54:50 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-02-18 14:54:50 +0000
commit3a859ffe2bd144012fc6ae94afb8563d80d40236 (patch)
tree0d52de4606baaf19f9af5de5c63efc1b0637ed89
parent7623ed6996c89008c08e7b303434bc2b9e5f09dd (diff)
downloadmpv-3a859ffe2bd144012fc6ae94afb8563d80d40236.tar.bz2
mpv-3a859ffe2bd144012fc6ae94afb8563d80d40236.tar.xz
Use liblzo2 instead of liblzo1, it's not bigger but faster.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22258 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure8
-rw-r--r--libmpcodecs/ve_nuv.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/configure b/configure
index 60ab0e2ab5..fe68c30344 100755
--- a/configure
+++ b/configure
@@ -5564,18 +5564,18 @@ fi
echores "$_rtc"
-echocheck "external liblzo support"
+echocheck "liblzo2 support"
if test "$_liblzo" = auto ; then
_liblzo=no
cat > $TMPC << EOF
-#include <lzo1x.h>
+#include <lzo/lzo1x.h>
int main(void) { lzo_init();return 0; }
EOF
- cc_check -llzo && _liblzo=yes
+ cc_check -llzo2 && _liblzo=yes
fi
if test "$_liblzo" = yes ; then
_def_liblzo='#define USE_LIBLZO 1'
- _ld_extra="$_ld_extra -llzo"
+ _ld_extra="$_ld_extra -llzo2"
_codecmodules="liblzo $_codecmodules"
else
_def_liblzo='#undef USE_LIBLZO'
diff --git a/libmpcodecs/ve_nuv.c b/libmpcodecs/ve_nuv.c
index c5466e7942..d20e4f105a 100644
--- a/libmpcodecs/ve_nuv.c
+++ b/libmpcodecs/ve_nuv.c
@@ -20,7 +20,7 @@
#include "vf.h"
#include "libmpdemux/nuppelvideo.h"
-#include <lzo1x.h>
+#include <lzo/lzo1x.h>
#include "native/RTjpegN.h"
#define LZO_AL(size) (((size) + (sizeof(long) - 1)) / sizeof(long))