Move "block" variable in rtjpeg decoder to context to ensure sufficient alignment

[ffmpeg] / libavutil / lzo.c

diff --git a/libavutil/lzo.c b/libavutil/lzo.c
index 83fa9bfbaf40167db783e54f0d6595f55c75f4f0..a876fc7776e538bf07422eabb471a039d124692e 100644 (file)
--- a/libavutil/lzo.c
+++ b/libavutil/lzo.c
@@ -234,17 +234,17 @@ int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen) {
     return c.error;
 }
 
-#if LIBAVUTIL_VERSION_MAJOR < 50
-int lzo1x_decode(void *out, int *outlen, const void *in, int *inlen) {
-    return av_lzo1x_decode(out, outlen, in, inlen);
-}
-#endif
-
 #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);
@@ -255,14 +255,14 @@ int main(int argc, char *argv[]) {
     long tmp[LZO1X_MEM_COMPRESS];
     int inlen, outlen;
     int i;
-    av_log_level = AV_LOG_DEBUG;
+    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;
-#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))