[MPlayer-cvslog] r22258 - in trunk: configure libmpcodecs/ve_nuv.c

[diego]

Author: diego
Date: Sun Feb 18 15:54:50 2007
New Revision: 22258

Modified:
   trunk/configure
   trunk/libmpcodecs/ve_nuv.c

Log:
Use liblzo2 instead of liblzo1, it's not bigger but faster.


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Sun Feb 18 15:54:50 2007
@@ -5564,18 +5564,18 @@
 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'

Modified: trunk/libmpcodecs/ve_nuv.c
==============================================================================
--- trunk/libmpcodecs/ve_nuv.c	(original)
+++ trunk/libmpcodecs/ve_nuv.c	Sun Feb 18 15:54:50 2007
@@ -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))