[FFmpeg-cvslog] avcodec/huffyuvencdsp: use an actual unsigned long constant

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Feb  6 19:57:53 2017 -0300| [b921b3b42b61a3dff19157bf3eec1f6f38a2cae7] | committer: James Almer

avcodec/huffyuvencdsp: use an actual unsigned long constant

Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b921b3b42b61a3dff19157bf3eec1f6f38a2cae7
---

 libavcodec/huffyuvencdsp.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavcodec/huffyuvencdsp.c b/libavcodec/huffyuvencdsp.c
index 7edcce8..427d118 100644
--- a/libavcodec/huffyuvencdsp.c
+++ b/libavcodec/huffyuvencdsp.c
@@ -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);