[SCM] libav/experimental: Give liblzo benchmark conditionals more descriptive names and add convenience definitions along with instructions for changing them.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 985fdd534f29e5c0e05e47216bb2ae9b8c353895
Author: Diego Biurrun <diego at biurrun.de>
Date:   Thu Apr 9 15:11:48 2009 +0000

    Give liblzo benchmark conditionals more descriptive names and add convenience
    definitions along with instructions for changing them.
    
    Originally committed as revision 18387 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/lzo.c b/libavutil/lzo.c
index 668c084..a876fc7 100644
--- a/libavutil/lzo.c
+++ b/libavutil/lzo.c
@@ -239,6 +239,12 @@ int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen) {
 #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);
@@ -254,9 +260,9 @@ int main(int argc, char *argv[]) {
     for (i = 0; i < 300; i++) {
 START_TIMER
         inlen = clen; outlen = MAXSZ;
-#ifdef LIBLZO
+#if BENCHMARK_LIBLZO_SAFE
         if (lzo1x_decompress_safe(comp, inlen, decomp, &outlen, NULL))
-#elif defined(LIBLZO_UNSAFE)
+#elif BENCHMARK_LIBLZO_UNSAFE
         if (lzo1x_decompress(comp, inlen, decomp, &outlen, NULL))
 #else
         if (av_lzo1x_decode(decomp, &outlen, comp, &inlen))

-- 
Libav/FFmpeg packaging