---
configure | 2 --
libavutil/Makefile | 3 ---
libavutil/lzo.c | 44 --------------------------------------------
3 files changed, 0 insertions(+), 49 deletions(-)
diff --git a/configure b/configure
index 1c96393..34d5850 100755
--- a/configure
+++ b/configure
@@ -1104,7 +1104,6 @@ HAVE_LIST="
loongson
lrint
lrintf
- lzo1x_999_compress
machine_ioctl_bt848_h
machine_ioctl_meteor_h
malloc_h
@@ -2858,7 +2857,6 @@ check_func sched_getaffinity
check_func sysconf
check_func sysctl
check_func_headers io.h setmode
-check_func_headers lzo/lzo1x.h lzo1x_999_compress
check_lib2 "windows.h psapi.h" GetProcessMemoryInfo -lpsapi
check_func_headers windows.h GetProcessAffinityMask
check_func_headers windows.h GetProcessTimes
diff --git a/libavutil/Makefile b/libavutil/Makefile
index 63d848a..4139744 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -77,10 +77,7 @@ OBJS-$(ARCH_X86) += x86/cpu.o
TESTPROGS = adler32 aes avstring base64 cpu crc des eval fifo lfg lls \
md5 opt parseutils rational sha tree
-TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
DIRS = arm bfin sh4 x86
ARCH_HEADERS = bswap.h intmath.h intreadwrite.h timer.h
-
-$(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2
diff --git a/libavutil/lzo.c b/libavutil/lzo.c
index 26cda12..fec3edb 100644
--- a/libavutil/lzo.c
+++ b/libavutil/lzo.c
@@ -241,47 +241,3 @@ int av_lzo1x_decode(void *out, int *outlen, const void
*in, int *inlen) {
*outlen = c.out_end - c.out;
return c.error;
}
-
-#ifdef TEST
-#include <stdio.h>
-#include <lzo/lzo1x.h>
-#include "log.h"
-#define MAXSZ (10*1024*1024)
-
-/* Define one of these to 1 if you wish to benchmark liblzo
- * instead of our native implementation. */
-#define BENCHMARK_LIBLZO_SAFE 0
-#define BENCHMARK_LIBLZO_UNSAFE 0
-
-int main(int argc, char *argv[]) {
- FILE *in = fopen(argv[1], "rb");
- uint8_t *orig = av_malloc(MAXSZ + 16);
- uint8_t *comp = av_malloc(2*MAXSZ + 16);
- uint8_t *decomp = av_malloc(MAXSZ + 16);
- size_t s = fread(orig, 1, MAXSZ, in);
- lzo_uint clen = 0;
- long tmp[LZO1X_MEM_COMPRESS];
- int inlen, outlen;
- int i;
- av_log_set_level(AV_LOG_DEBUG);
- lzo1x_999_compress(orig, s, comp, &clen, tmp);
- for (i = 0; i < 300; i++) {
-START_TIMER
- inlen = clen; outlen = MAXSZ;
-#if BENCHMARK_LIBLZO_SAFE
- if (lzo1x_decompress_safe(comp, inlen, decomp, &outlen, NULL))
-#elif BENCHMARK_LIBLZO_UNSAFE
- if (lzo1x_decompress(comp, inlen, decomp, &outlen, NULL))
-#else
- if (av_lzo1x_decode(decomp, &outlen, comp, &inlen))
-#endif
- av_log(NULL, AV_LOG_ERROR, "decompression error\n");
-STOP_TIMER("lzod")
- }
- if (memcmp(orig, decomp, s))
- av_log(NULL, AV_LOG_ERROR, "decompression incorrect\n");
- else
- av_log(NULL, AV_LOG_ERROR, "decompression OK\n");
- return 0;
-}
-#endif
--
1.7.1
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
