# HG changeset patch
# User ramiro
# Date 1218686285 0
# Node ID d112b4655bbd9ff02b3c45d908448e622dcdce8a
# Parent  474c7ae4b431d81c692d1a0b3628b4dad96101e0
mlp: split simple inline function that xors 4 bytes into one.

diff -r 474c7ae4b431 -r d112b4655bbd mlp.c
--- a/mlp.c	Wed Aug 13 23:36:37 2008 +0000
+++ b/mlp.c	Thu Aug 14 03:58:05 2008 +0000
@@ -110,8 +110,7 @@
     for (; buf < buf_end - 3; buf += 4)
         scratch ^= *((const uint32_t*)buf);
 
-    scratch ^= scratch >> 16;
-    scratch ^= scratch >> 8;
+    scratch = xor_32_to_8(scratch);
 
     for (; buf < buf_end; buf++)
         scratch ^= *buf;
diff -r 474c7ae4b431 -r d112b4655bbd mlp.h
--- a/mlp.h	Wed Aug 13 23:36:37 2008 +0000
+++ b/mlp.h	Thu Aug 14 03:58:05 2008 +0000
@@ -107,4 +107,12 @@
 
 void ff_mlp_init_crc();
 
+/** XOR four bytes into one. */
+static inline uint8_t xor_32_to_8(uint32_t value)
+{
+    value ^= value >> 16;
+    value ^= value >>  8;
+    return value;
+}
+
 #endif /* FFMPEG_MLP_H */
diff -r 474c7ae4b431 -r d112b4655bbd mlpdec.c
--- a/mlpdec.c	Wed Aug 13 23:36:37 2008 +0000
+++ b/mlpdec.c	Thu Aug 14 03:58:05 2008 +0000
@@ -364,10 +364,7 @@
     lossless_check = get_bits(gbp, 8);
     if (substr == m->max_decoded_substream
         && s->lossless_check_data != 0xffffffff) {
-        tmp = s->lossless_check_data;
-        tmp ^= tmp >> 16;
-        tmp ^= tmp >> 8;
-        tmp &= 0xff;
+        tmp = xor_32_to_8(s->lossless_check_data);
         if (tmp != lossless_check)
             av_log(m->avctx, AV_LOG_WARNING,
                    "Lossless check failed - expected %02x, calculated %02x.\n",