avcodec/huffyuvencdsp: use an actual unsigned long constant
authorJames Almer <jamrial@gmail.com>
Mon, 6 Feb 2017 22:57:53 +0000 (19:57 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 19 Feb 2017 15:27:12 +0000 (12:27 -0300)
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
libavcodec/huffyuvencdsp.c

index 7edcce872babdb41e45717a4a33f32457856f147..427d118be45189ec75cd548ac96957800bd9c574 100644 (file)
@@ -21,6 +21,9 @@
 #include "huffyuvencdsp.h"
 #include "mathops.h"
 
+// 0x00010001 or 0x0001000100010001 or whatever, depending on the cpu's native arithmetic size
+#define pw_1 (ULONG_MAX / UINT16_MAX)
+
 static void diff_int16_c(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w){
     long i;
 #if !HAVE_FAST_UNALIGNED
@@ -34,8 +37,8 @@ static void diff_int16_c(uint16_t *dst, const uint16_t *src1, const uint16_t *sr
     }else
 #endif
     {
-        unsigned long pw_lsb = (mask >> 1) * 0x0001000100010001ULL;
-        unsigned long pw_msb = pw_lsb +  0x0001000100010001ULL;
+        unsigned long pw_lsb = (mask >> 1) * pw_1;
+        unsigned long pw_msb = pw_lsb +  pw_1;
 
         for (i = 0; i <= w - (int)sizeof(long)/2; i += sizeof(long)/2) {
             long a = *(long*)(src1+i);