57 lines
1.7 KiB
Diff
57 lines
1.7 KiB
Diff
|
diff -ru MPlayer-1.0rc1/libmpcodecs/native/minilzo.c MPlayer-1.0rc1-fix/libmpcodecs/native/minilzo.c
|
||
|
|
--- MPlayer-1.0rc1/libmpcodecs/native/minilzo.c 2006-10-23 00:32:24.000000000 +0200
|
||
|
|
+++ MPlayer-1.0rc1-fix/libmpcodecs/native/minilzo.c 2007-01-22 10:29:26.000000000 +0100
|
||
|
|
@@ -61,7 +61,7 @@
|
||
|
|
|
||
|
|
#if !defined(__LZO_IN_MINILZO)
|
||
|
|
# ifndef __LZOCONF_H
|
||
|
|
-# include <lzoconf.h>
|
||
|
|
+# include <lzo/lzoconf.h>
|
||
|
|
# endif
|
||
|
|
#endif
|
||
|
|
|
||
|
|
@@ -1307,7 +1307,7 @@
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#if !defined(__LZO_IN_MINILZO)
|
||
|
|
-#include <lzo1x.h>
|
||
|
|
+#include <lzo/lzo1x.h>
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#define LZO_EOF_CODE
|
||
|
|
diff -ru MPlayer-1.0rc1/libmpcodecs/vd_lzo.c MPlayer-1.0rc1-fix/libmpcodecs/vd_lzo.c
|
||
|
|
--- MPlayer-1.0rc1/libmpcodecs/vd_lzo.c 2006-10-23 00:32:24.000000000 +0200
|
||
|
|
+++ MPlayer-1.0rc1-fix/libmpcodecs/vd_lzo.c 2007-01-22 10:30:12.000000000 +0100
|
||
|
|
@@ -7,7 +7,7 @@
|
||
|
|
#include "vd_internal.h"
|
||
|
|
|
||
|
|
#ifdef USE_LIBLZO
|
||
|
|
-#include <lzo1x.h>
|
||
|
|
+#include <lzo/lzo1x.h>
|
||
|
|
#else
|
||
|
|
#include "native/minilzo.h"
|
||
|
|
#define lzo_malloc malloc
|
||
|
|
diff -ru MPlayer-1.0rc1/libmpdemux/demux_mkv.c MPlayer-1.0rc1-fix/libmpdemux/demux_mkv.c
|
||
|
|
--- MPlayer-1.0rc1/libmpdemux/demux_mkv.c 2006-10-23 00:32:31.000000000 +0200
|
||
|
|
+++ MPlayer-1.0rc1-fix/libmpdemux/demux_mkv.c 2007-01-22 10:25:19.000000000 +0100
|
||
|
|
@@ -35,7 +35,7 @@
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#ifdef USE_LIBLZO
|
||
|
|
-#include <lzo1x.h>
|
||
|
|
+#include <lzo/lzo1x.h>
|
||
|
|
#else
|
||
|
|
#include "libmpcodecs/native/minilzo.h"
|
||
|
|
#endif
|
||
|
|
--- MPlayer-1.0rc1/configure.orig 2007-01-22 11:03:32.000000000 +0100
|
||
|
|
+++ MPlayer-1.0rc1/configure 2007-01-22 11:04:10.000000000 +0100
|
||
|
|
@@ -5569,7 +5569,7 @@
|
||
|
|
fi
|
||
|
|
if test "$_liblzo" = yes ; then
|
||
|
|
_def_liblzo='#define USE_LIBLZO 1'
|
||
|
|
- _ld_liblzo='-llzo'
|
||
|
|
+ _ld_liblzo='-llzo2'
|
||
|
|
_codecmodules="liblzo $_codecmodules"
|
||
|
|
else
|
||
|
|
_def_liblzo='#undef USE_LIBLZO'
|